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>

diff --git a/scripts/namespace.pl b/scripts/namespace.pl
index f34373853ef845fea8222b3c6ecb95b779573e9f..c6e88c652c2f941647f0d04b3cd982fc6c4e7ab5 100755 (executable)
--- a/scripts/namespace.pl
+++ b/scripts/namespace.pl
@@ -105,7 +105,7 @@ sub linux_objects
        if (/.*\.o$/ &&
                ! (
                m:/built-in.o$:
        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$:
                || 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_/ &&
                        }
                        # 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";
                                next;
                        }
                        printf "$name is multiply defined in :-\n";