Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d2c75f2f4b8be1c78f275c49e399d5a9b21ce924
Commit:     d2c75f2f4b8be1c78f275c49e399d5a9b21ce924
Parent:     91e034eff1a79835739c6494e9b90796ee43300c
Author:     Thomas Gleixner <[EMAIL PROTECTED]>
AuthorDate: Thu Oct 11 17:56:02 2007 +0200
Committer:  Thomas Gleixner <[EMAIL PROTECTED]>
CommitDate: Thu Oct 11 17:56:02 2007 +0200

    x86: fixup the x86 namespace change in scripts/namespace.pl
    
    Let namespace.pl look at the correct files.
    
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
---
 scripts/namespace.pl |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/namespace.pl b/scripts/namespace.pl
index f343738..c6e88c6 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";
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to