浏览代码

i386: Fix leak of ../kernel from top level

Fix a compile error when the directory above the kernel source contains
a file named "kernel".  Originally from Ben LaHaise, modified based on
feedback from Sam Ravnborg

Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Ben LaHaise <bcrl@kvack.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Andi Kleen 18 年之前
父节点
当前提交
9863b78a1a
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      arch/i386/mach-generic/Makefile
  2. 1 1
      arch/i386/mach-voyager/Makefile

+ 1 - 1
arch/i386/mach-generic/Makefile

@@ -2,6 +2,6 @@
 # Makefile for the generic architecture
 # Makefile for the generic architecture
 #
 #
 
 
-EXTRA_CFLAGS	+= -I../kernel
+EXTRA_CFLAGS	:= -Iarch/i386/kernel
 
 
 obj-y				:= probe.o summit.o bigsmp.o es7000.o default.o ../mach-es7000/
 obj-y				:= probe.o summit.o bigsmp.o es7000.o default.o ../mach-es7000/

+ 1 - 1
arch/i386/mach-voyager/Makefile

@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 # Makefile for the linux kernel.
 #
 #
 
 
-EXTRA_CFLAGS	+= -I../kernel
+EXTRA_CFLAGS	:= -Iarch/i386/kernel
 obj-y			:= setup.o voyager_basic.o voyager_thread.o
 obj-y			:= setup.o voyager_basic.o voyager_thread.o
 
 
 obj-$(CONFIG_SMP)	+= voyager_smp.o voyager_cat.o
 obj-$(CONFIG_SMP)	+= voyager_smp.o voyager_cat.o