[POWERPC] Exception numbers are not relevant to iSeries

so remove them from the macros.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/platforms/iseries/exception.S b/arch/powerpc/platforms/iseries/exception.S
index e9a3435b3c18b49f1ddfdbf057e55364c2d6eadf..5381038f088141c7c4ecd972369c463dc7d393d6 100644 (file)
--- a/arch/powerpc/platforms/iseries/exception.S
+++ b/arch/powerpc/platforms/iseries/exception.S
@@ -88,7 +88,7 @@ iSeries_secondary_smp_loop:
 
 /***  ISeries-LPAR interrupt handlers ***/
 
-       STD_EXCEPTION_ISERIES(0x200, machine_check, PACA_EXMC)
+       STD_EXCEPTION_ISERIES(machine_check, PACA_EXMC)
 
        .globl data_access_iSeries
 data_access_iSeries:
@@ -137,7 +137,7 @@ data_access_slb_iSeries:
        ld      r12,LPPACASRR1(r12)
        b       .slb_miss_realmode
 
-       STD_EXCEPTION_ISERIES(0x400, instruction_access, PACA_EXGEN)
+       STD_EXCEPTION_ISERIES(instruction_access, PACA_EXGEN)
 
        .globl  instruction_access_slb_iSeries
 instruction_access_slb_iSeries:
@@ -176,13 +176,13 @@ slb_miss_user_iseries:
        b       slb_miss_user_common
 #endif
 
-       MASKABLE_EXCEPTION_ISERIES(0x500, hardware_interrupt)
-       STD_EXCEPTION_ISERIES(0x600, alignment, PACA_EXGEN)
-       STD_EXCEPTION_ISERIES(0x700, program_check, PACA_EXGEN)
-       STD_EXCEPTION_ISERIES(0x800, fp_unavailable, PACA_EXGEN)
-       MASKABLE_EXCEPTION_ISERIES(0x900, decrementer)
-       STD_EXCEPTION_ISERIES(0xa00, trap_0a, PACA_EXGEN)
-       STD_EXCEPTION_ISERIES(0xb00, trap_0b, PACA_EXGEN)
+       MASKABLE_EXCEPTION_ISERIES(hardware_interrupt)
+       STD_EXCEPTION_ISERIES(alignment, PACA_EXGEN)
+       STD_EXCEPTION_ISERIES(program_check, PACA_EXGEN)
+       STD_EXCEPTION_ISERIES(fp_unavailable, PACA_EXGEN)
+       MASKABLE_EXCEPTION_ISERIES(decrementer)
+       STD_EXCEPTION_ISERIES(trap_0a, PACA_EXGEN)
+       STD_EXCEPTION_ISERIES(trap_0b, PACA_EXGEN)
 
        .globl  system_call_iSeries
 system_call_iSeries:
@@ -191,9 +191,9 @@ system_call_iSeries:
        EXCEPTION_PROLOG_ISERIES_1
        b       system_call_common
 
-       STD_EXCEPTION_ISERIES( 0xd00, single_step, PACA_EXGEN)
-       STD_EXCEPTION_ISERIES( 0xe00, trap_0e, PACA_EXGEN)
-       STD_EXCEPTION_ISERIES( 0xf00, performance_monitor, PACA_EXGEN)
+       STD_EXCEPTION_ISERIES(single_step, PACA_EXGEN)
+       STD_EXCEPTION_ISERIES(trap_0e, PACA_EXGEN)
+       STD_EXCEPTION_ISERIES(performance_monitor, PACA_EXGEN)
 
 decrementer_iSeries_masked:
        /* We may not have a valid TOC pointer in here. */

diff --git a/arch/powerpc/platforms/iseries/exception.h b/arch/powerpc/platforms/iseries/exception.h
index 5b3f285e8168eee55566e9e63e4c3e3beef0b192..ced45a8fa1aa40c99736c13f00d9d869dd10ee37 100644 (file)
--- a/arch/powerpc/platforms/iseries/exception.h
+++ b/arch/powerpc/platforms/iseries/exception.h
@@ -34,7 +34,7 @@
        ori     r10,r10,MSR_RI;                                         \
        mtmsrd  r10,1
 
-#define STD_EXCEPTION_ISERIES(n, label, area)                          \
+#define STD_EXCEPTION_ISERIES(label, area)                             \
        .globl label##_iSeries;                                         \
 label##_iSeries:                                                       \
        HMT_MEDIUM;                                                     \
@@ -43,7 +43,7 @@ label##_iSeries:                                                      \
        EXCEPTION_PROLOG_ISERIES_1;                                     \
        b       label##_common
 
-#define MASKABLE_EXCEPTION_ISERIES(n, label)                           \
+#define MASKABLE_EXCEPTION_ISERIES(label)                              \
        .globl label##_iSeries;                                         \
 label##_iSeries:                                                       \
        HMT_MEDIUM;                                                     \