Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / arch / parisc / kernel / real2.S

diff --git a/arch/parisc/kernel/real2.S b/arch/parisc/kernel/real2.S
index 8c2859c..789061f 100644 (file)
--- a/arch/parisc/kernel/real2.S
+++ b/arch/parisc/kernel/real2.S
@@ -7,7 +7,6 @@
  * Copyright (C) 2000 Hewlett Packard (Paul Bame bame@puffin.external.hp.com)
  *
  */
-#include <linux/config.h>
 
 #include <asm/psw.h>
 #include <asm/assembly.h>
@@ -276,15 +275,6 @@ r64_ret:
 
 #endif
 
-       .export pc_in_user_space
-       .text
-       /* Doesn't belong here but I couldn't find a nicer spot. */
-       /* Should never get called, only used by profile stuff in time.c */
-pc_in_user_space:
-       bv,n    0(%rp)
-       nop
-
-
        .export __canonicalize_funcptr_for_compare
        .text
        /* http://lists.parisc-linux.org/hypermail/parisc-linux/10916.html