Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca5cd877 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

x86 merge fallout: uml 



Don't undef __i386__/__x86_64__ in uml anymore, make sure that (few) places
that required adjusting the ifdefs got those.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2a397e82

arch/um/Makefile-i386

+1 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ ELF_ARCH := $(SUBARCH) 
ELF_FORMAT 		:= elf32-$(SUBARCH)

OBJCOPYFLAGS  		:= -O binary -R .note -R .comment -S

HEADER_ARCH		:= x86

CHECKFLAGS	+= -D__i386__



ifeq ("$(origin SUBARCH)", "command line")

ifneq ("$(shell uname -m | sed -e s/i.86/i386/)", "$(SUBARCH)")
@@ -26,8 +27,6 @@ AFLAGS += -DCONFIG_X86_32 
CONFIG_X86_32		:= y

export CONFIG_X86_32



ARCH_KERNEL_DEFINES += -U__$(SUBARCH)__ -U$(SUBARCH)



# First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y.

include $(srctree)/arch/i386/Makefile.cpu

arch/um/Makefile-x86_64

+1 −4
Original line number Diff line number Diff line
@@ -6,12 +6,9 @@ START := 0x60000000 


_extra_flags_ = -fno-builtin -m64



#We #undef __x86_64__ for kernelspace, not for userspace where

#it's needed for headers to work!

ARCH_KERNEL_DEFINES = -U__$(SUBARCH)__

KBUILD_CFLAGS += $(_extra_flags_)



CHECKFLAGS  += -m64

CHECKFLAGS  += -m64 -D__x86_64__

KBUILD_AFLAGS += -m64

LDFLAGS += -m elf_x86_64

KBUILD_CPPFLAGS += -m64

drivers/char/mem.c

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
 */

static inline int uncached_access(struct file *file, unsigned long addr)

{

#if defined(__i386__)

#if defined(__i386__) && !defined(__arch_um__)

	/*

	 * On the PPro and successors, the MTRRs are used to set

	 * memory types for physical addresses outside main memory,
@@ -57,7 +57,7 @@ static inline int uncached_access(struct file *file, unsigned long addr) 
		  test_bit(X86_FEATURE_CYRIX_ARR, boot_cpu_data.x86_capability) ||

		  test_bit(X86_FEATURE_CENTAUR_MCR, boot_cpu_data.x86_capability) )

	  && addr >= __pa(high_memory);

#elif defined(__x86_64__)

#elif defined(__x86_64__) && !defined(__arch_um__)

	/* 

	 * This is broken because it can generate memory type aliases,

	 * which can cause cache corruptions

drivers/md/raid6algos.c

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ const struct raid6_calls * const raid6_algos[] = { 
	&raid6_intx16,

	&raid6_intx32,

#endif

#if defined(__i386__)

#if defined(__i386__) && !defined(__arch_um__)

	&raid6_mmxx1,

	&raid6_mmxx2,

	&raid6_sse1x1,
@@ -60,7 +60,7 @@ const struct raid6_calls * const raid6_algos[] = { 
	&raid6_sse2x1,

	&raid6_sse2x2,

#endif

#if defined(__x86_64__)

#if defined(__x86_64__) && !defined(__arch_um__)

	&raid6_sse2x1,

	&raid6_sse2x2,

	&raid6_sse2x4,

drivers/md/raid6mmx.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 * MMX implementation of RAID-6 syndrome functions

 */



#if defined(__i386__)

#if defined(__i386__) && !defined(__arch_um__)



#include "raid6.h"

#include "raid6x86.h"