diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:56:02 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:56:02 -0400 |
commit | d2c75f2f4b8be1c78f275c49e399d5a9b21ce924 (patch) | |
tree | cfd8572905207f808ef48035c5798289210264f0 /scripts/namespace.pl | |
parent | 91e034eff1a79835739c6494e9b90796ee43300c (diff) |
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/namespace.pl')
-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 | |||
105 | if (/.*\.o$/ && | 105 | if (/.*\.o$/ && |
106 | ! ( | 106 | ! ( |
107 | m:/built-in.o$: | 107 | m:/built-in.o$: |
108 | || m:arch/i386/kernel/vsyscall-syms.o$: | 108 | || m:arch/x86/kernel/vsyscall-syms.o$: |
109 | || m:arch/ia64/ia32/ia32.o$: | 109 | || m:arch/ia64/ia32/ia32.o$: |
110 | || m:arch/ia64/kernel/gate-syms.o$: | 110 | || m:arch/ia64/kernel/gate-syms.o$: |
111 | || m:arch/ia64/lib/__divdi3.o$: | 111 | || m:arch/ia64/lib/__divdi3.o$: |
@@ -328,9 +328,9 @@ sub list_multiply_defined | |||
328 | } | 328 | } |
329 | # Special case for i386 entry code | 329 | # Special case for i386 entry code |
330 | if ($#{$def{$name}} == 1 && $name =~ /^__kernel_/ && | 330 | if ($#{$def{$name}} == 1 && $name =~ /^__kernel_/ && |
331 | $def{$name}[0] eq "arch/i386/kernel/vsyscall-int80.o" && | 331 | $def{$name}[0] eq "arch/x86/kernel/vsyscall-int80_32.o" && |
332 | $def{$name}[1] eq "arch/i386/kernel/vsyscall-sysenter.o") { | 332 | $def{$name}[1] eq "arch/x86/kernel/vsyscall-sysenter_32.o") { |
333 | &drop_def("arch/i386/kernel/vsyscall-sysenter.o", $name); | 333 | &drop_def("arch/x86/kernel/vsyscall-sysenter_32.o", $name); |
334 | next; | 334 | next; |
335 | } | 335 | } |
336 | printf "$name is multiply defined in :-\n"; | 336 | printf "$name is multiply defined in :-\n"; |