Patch "um: Stop abusing __KERNEL__" has been added to the 3.18-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
um: Stop abusing __KERNEL__
to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
um-stop-abusing-__kernel__.patch
and it can be found in the queue-3.18 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
298e20ba8c197e8d429a6c8671550c41c7919033Mon Sep 17 00:00:00 2001
From: Richard Weinberger <[email protected]>
Date: Sun, 31 May 2015 19:50:57 +0200
Subject: um: Stop abusing __KERNEL__
From: Richard Weinberger <[email protected]>
commit 298e20ba8c197e8d429a6c8671550c41c7919033 upstream.
Currently UML is abusing __KERNEL__ to distinguish between kernel and host code (os-Linux). It is better to use a custom define such that existing users of __KERNEL__ don't get confused.
--- arch/um/Makefile | 7 ++++--- arch/um/drivers/mconsole.h | 2 +- arch/um/include/shared/init.h | 4 ++-- arch/um/include/shared/user.h | 2 +- arch/x86/um/shared/sysdep/tls.h | 6 +++--- 5 files changed, 11 insertions(+), 10 deletions(-)
arch/um/Makefile +4 -3
@@ -68,9 +68,10 @@ KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) - KBUILD_AFLAGS += $(ARCH_INCLUDE) -USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\ - $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \ - $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include +USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -I%,,$(KBUILD_CFLAGS))) \ + $(ARCH_INCLUDE) $(MODE_INCLUDE) $(filter -I%,$(CFLAGS)) \ + -D_FILE_OFFSET_BITS=64 -idirafter include \ + -D__KERNEL__ -D__UM_HOST__ #This will adjust *FLAGS accordingly to the platform. include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
arch/um/drivers/mconsole.h +1 -1
@@ -7,7 +7,7 @@#ifndef __MCONSOLE_H__#define __MCONSOLE_H__ -#ifndef __KERNEL__ +#ifdef __UM_HOST__#include <stdint.h> #define u32 uint32_t#endif
arch/um/include/shared/init.h +2 -2
@@ -40,7 +40,7 @@typedef int (*initcall_t )(void );typedef void (*exitcall_t )(void ); -#ifndef __KERNEL__ +#ifdef __UM_HOST__#ifndef __section# define __section (S ) __attribute__ ((__section__(#S)))#endif
@@ -131,7 +131,7 @@ extern struct uml_param __uml_setup_star#define __uml_postsetup_call __used __section(.uml.postsetup.init)#define __uml_exit_call __used __section(.uml.exitcall.exit) -#ifndef __KERNEL__ +#ifdef __UM_HOST__#define __define_initcall (level,fn) \ static initcall_t __initcall_##fn __used \
arch/um/include/shared/user.h +1 -1
@@ -17,7 +17,7 @@#define ARRAY_SIZE (x) (sizeof(x) / sizeof((x)[0]))/* This is to get size_t */ -#ifdef __KERNEL__ +#ifndef __UM_HOST__#include <linux/types.h> #else #include <stddef.h>
arch/x86/um/shared/sysdep/tls.h +3 -3
@@ -1,7 +1,7 @@#ifndef _SYSDEP_TLS_H#define _SYSDEP_TLS_H -# ifndef __KERNEL__ +#ifdef __UM_HOST__/* Change name to avoid conflicts with the original one from <asm/ldt.h>, which * may be named user_desc (but in 2.4 and in header matching its API was named
@@ -22,11 +22,11 @@ typedef struct um_dup_user_desc { #endif } user_desc_t; -# else /* __KERNEL__ */ +#else /* __UM_HOST__ */ typedef struct user_desc user_desc_t ; -# endif /* __KERNEL__ */ +#endif /* __UM_HOST__ */ extern int os_set_thread_area (user_desc_t *info,int pid);extern int os_get_thread_area (user_desc_t *info,int pid);
Patches currently in stable-queue which might be from [email protected] are
queue-3.18/um-stop-abusing-__kernel__.patch queue-3.18/um-link-vmlinux-with-no-pie.patch queue-3.18/um-remove-copy-paste-code-from-init.h.patch