Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=94577c112487d68db4f258bd19cfc7100480d0cc
Commit:     94577c112487d68db4f258bd19cfc7100480d0cc
Parent:     7099ec6e17b3d207f1c622cff023209acc6ba47a
Author:     Thomas Gleixner <[EMAIL PROTECTED]>
AuthorDate: Thu Oct 11 11:13:52 2007 +0200
Committer:  Thomas Gleixner <[EMAIL PROTECTED]>
CommitDate: Thu Oct 11 11:13:52 2007 +0200

    i386: prepare shared mm/extable.c
    
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
---
 arch/i386/mm/Makefile     |    2 +-
 arch/i386/mm/extable.c    |   35 -----------------------------------
 arch/i386/mm/extable_32.c |   35 +++++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/arch/i386/mm/Makefile b/arch/i386/mm/Makefile
index 969769a..c5ae643 100644
--- a/arch/i386/mm/Makefile
+++ b/arch/i386/mm/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux i386-specific parts of the memory manager.
 #
 
-obj-y  := init_32.o pgtable.o fault.o ioremap_32.o extable.o pageattr.o 
mmap_32.o
+obj-y  := init_32.o pgtable.o fault.o ioremap_32.o extable_32.o pageattr.o 
mmap_32.o
 
 obj-$(CONFIG_NUMA) += discontig_32.o
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
diff --git a/arch/i386/mm/extable.c b/arch/i386/mm/extable.c
deleted file mode 100644
index 0ce4f22..0000000
--- a/arch/i386/mm/extable.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * linux/arch/i386/mm/extable.c
- */
-
-#include <linux/module.h>
-#include <linux/spinlock.h>
-#include <asm/uaccess.h>
-
-int fixup_exception(struct pt_regs *regs)
-{
-       const struct exception_table_entry *fixup;
-
-#ifdef CONFIG_PNPBIOS
-       if (unlikely(SEGMENT_IS_PNP_CODE(regs->xcs)))
-       {
-               extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
-               extern u32 pnp_bios_is_utter_crap;
-               pnp_bios_is_utter_crap = 1;
-               printk(KERN_CRIT "PNPBIOS fault.. attempting recovery.\n");
-               __asm__ volatile(
-                       "movl %0, %%esp\n\t"
-                       "jmp *%1\n\t"
-                       : : "g" (pnp_bios_fault_esp), "g" (pnp_bios_fault_eip));
-               panic("do_trap: can't hit this");
-       }
-#endif
-
-       fixup = search_exception_tables(regs->eip);
-       if (fixup) {
-               regs->eip = fixup->fixup;
-               return 1;
-       }
-
-       return 0;
-}
diff --git a/arch/i386/mm/extable_32.c b/arch/i386/mm/extable_32.c
new file mode 100644
index 0000000..0ce4f22
--- /dev/null
+++ b/arch/i386/mm/extable_32.c
@@ -0,0 +1,35 @@
+/*
+ * linux/arch/i386/mm/extable.c
+ */
+
+#include <linux/module.h>
+#include <linux/spinlock.h>
+#include <asm/uaccess.h>
+
+int fixup_exception(struct pt_regs *regs)
+{
+       const struct exception_table_entry *fixup;
+
+#ifdef CONFIG_PNPBIOS
+       if (unlikely(SEGMENT_IS_PNP_CODE(regs->xcs)))
+       {
+               extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
+               extern u32 pnp_bios_is_utter_crap;
+               pnp_bios_is_utter_crap = 1;
+               printk(KERN_CRIT "PNPBIOS fault.. attempting recovery.\n");
+               __asm__ volatile(
+                       "movl %0, %%esp\n\t"
+                       "jmp *%1\n\t"
+                       : : "g" (pnp_bios_fault_esp), "g" (pnp_bios_fault_eip));
+               panic("do_trap: can't hit this");
+       }
+#endif
+
+       fixup = search_exception_tables(regs->eip);
+       if (fixup) {
+               regs->eip = fixup->fixup;
+               return 1;
+       }
+
+       return 0;
+}
-
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