diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 17:56:02 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 17:56:02 +0200 |
| commit | d2c75f2f4b8be1c78f275c49e399d5a9b21ce924 (patch) | |
| tree | cfd8572905207f808ef48035c5798289210264f0 /scripts | |
| parent | x86: Fix the $(ARCH) dependent help output in the top Makefile (diff) | |
| download | linux-d2c75f2f4b8be1c78f275c49e399d5a9b21ce924.tar.xz linux-d2c75f2f4b8be1c78f275c49e399d5a9b21ce924.zip | |
x86: fixup the x86 namespace change in scripts/namespace.pl
Let namespace.pl look at the correct files.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/namespace.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/namespace.pl b/scripts/namespace.pl index f34373853ef8..c6e88c652c2f 100755 --- a/scripts/namespace.pl +++ b/scripts/namespace.pl @@ -105,7 +105,7 @@ sub linux_objects if (/.*\.o$/ && ! ( m:/built-in.o$: - || m:arch/i386/kernel/vsyscall-syms.o$: + || m:arch/x86/kernel/vsyscall-syms.o$: || m:arch/ia64/ia32/ia32.o$: || m:arch/ia64/kernel/gate-syms.o$: || m:arch/ia64/lib/__divdi3.o$: @@ -328,9 +328,9 @@ sub list_multiply_defined } # Special case for i386 entry code if ($#{$def{$name}} == 1 && $name =~ /^__kernel_/ && - $def{$name}[0] eq "arch/i386/kernel/vsyscall-int80.o" && - $def{$name}[1] eq "arch/i386/kernel/vsyscall-sysenter.o") { - &drop_def("arch/i386/kernel/vsyscall-sysenter.o", $name); + $def{$name}[0] eq "arch/x86/kernel/vsyscall-int80_32.o" && + $def{$name}[1] eq "arch/x86/kernel/vsyscall-sysenter_32.o") { + &drop_def("arch/x86/kernel/vsyscall-sysenter_32.o", $name); next; } printf "$name is multiply defined in :-\n"; |