PPC32: Audit <asm/processor.h> uses.

arch/ppc/boot/prep/head.S

 #include <asm/ppc_asm.h>
-#include <asm/processor.h>
+#include <asm/reg.h>
 #include <asm/cache.h>
 
 	.text

arch/ppc/boot/simple/head.S

@@ -14,7 +14,7 @@
  */
 
 #include <linux/config.h>
-#include <asm/processor.h>
+#include <asm/reg.h>
 #include <asm/cache.h>
 #include <asm/ppc_asm.h>
 

arch/ppc/boot/simple/misc-embedded.c

@@ -13,7 +13,6 @@
 #include <asm/bootinfo.h>
 #include <asm/mmu.h>
 #include <asm/page.h>
-#include <asm/processor.h>
 #include <asm/residual.h>
 #if defined(CONFIG_4xx)
 #include <asm/ibm4xx.h>

arch/ppc/boot/simple/misc-ev64260.S

@@ -13,7 +13,6 @@
  */
 
 #include <asm/ppc_asm.h>
-#include <asm/processor.h>
 #include <asm/cache.h>
 #include <asm/gt64260_defs.h>
 

arch/ppc/boot/simple/misc-spruce.c

@@ -20,7 +20,6 @@
 #include <linux/pci.h>
 
 #include <asm/page.h>
-#include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/bootinfo.h>
 

arch/ppc/boot/simple/misc.c

@@ -22,7 +22,6 @@
 #include <linux/string.h>
 
 #include <asm/page.h>
-#include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/bootinfo.h>
 #ifdef CONFIG_44x

arch/ppc/boot/simple/relocate.S

@@ -16,7 +16,6 @@
  */
 
 #include <linux/config.h>
-#include <asm/processor.h>
 #include <asm/cache.h>
 #include <asm/ppc_asm.h>
 

arch/ppc/kernel/idle.c

@@ -26,7 +26,6 @@
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/io.h>
-#include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/cache.h>
 #include <asm/cputable.h>

arch/ppc/kernel/ppc_htab.c

@@ -23,7 +23,6 @@
 #include <asm/uaccess.h>
 #include <asm/bitops.h>
 #include <asm/mmu.h>
-#include <asm/processor.h>
 #include <asm/residual.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>

arch/ppc/kernel/softemu8xx.c

@@ -30,7 +30,6 @@
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/io.h>
-#include <asm/processor.h>
 
 extern void
 print_8xx_pte(struct mm_struct *mm, unsigned long addr);

arch/ppc/kernel/temp.c

@@ -23,7 +23,7 @@
 
 #include <asm/segment.h>
 #include <asm/io.h>
-#include <asm/processor.h>
+#include <asm/reg.h>
 #include <asm/nvram.h>
 #include <asm/cache.h>
 #include <asm/8xx_immap.h>

arch/ppc/kernel/time.c

@@ -59,7 +59,6 @@
 
 #include <asm/segment.h>
 #include <asm/io.h>
-#include <asm/processor.h>
 #include <asm/nvram.h>
 #include <asm/cache.h>
 #include <asm/8xx_immap.h>
@@ -431,4 +430,3 @@ unsigned mulhwu_scale_factor(unsigned inscale, unsigned outscale) {
 	if (err <= inscale/2) mlt++;
 	return mlt;
 }
-

arch/ppc/kernel/traps.c

@@ -35,7 +35,7 @@
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/io.h>
-#include <asm/processor.h>
+#include <asm/reg.h>
 #include <asm/xmon.h>
 #ifdef CONFIG_PMAC_BACKLIGHT
 #include <asm/backlight.h>

arch/ppc/math-emu/math.c

@@ -9,7 +9,7 @@
 #include <linux/sched.h>
 
 #include <asm/uaccess.h>
-#include <asm/processor.h>
+#include <asm/reg.h>
 
 #include "sfp-machine.h"
 #include "double.h"

arch/ppc/platforms/4xx/oak_setup.c

@@ -22,7 +22,6 @@
 #include <linux/irq.h>
 #include <linux/seq_file.h>
 
-#include <asm/processor.h>
 #include <asm/board.h>
 #include <asm/machdep.h>
 #include <asm/page.h>

arch/ppc/platforms/4xx/sycamore.c

@@ -24,7 +24,6 @@
 #include <asm/ppc4xx_pic.h>
 #include <asm/system.h>
 #include <asm/pci-bridge.h>
-#include <asm/processor.h>
 #include <asm/machdep.h>
 #include <asm/page.h>
 #include <asm/time.h>

arch/ppc/platforms/4xx/walnut.c

@@ -24,7 +24,6 @@
 
 #include <asm/system.h>
 #include <asm/pci-bridge.h>
-#include <asm/processor.h>
 #include <asm/machdep.h>
 #include <asm/page.h>
 #include <asm/time.h>

arch/ppc/platforms/chrp_setup.c

@@ -38,7 +38,6 @@
 #include <linux/root_dev.h>
 #include <linux/initrd.h>
 
-#include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/prom.h>

arch/ppc/platforms/chrp_time.c

@@ -24,7 +24,6 @@
 
 #include <asm/segment.h>
 #include <asm/io.h>
-#include <asm/processor.h>
 #include <asm/nvram.h>
 #include <asm/prom.h>
 #include <asm/sections.h>

arch/ppc/platforms/gemini_prom.S

@@ -9,7 +9,7 @@
  */
 
 #include <linux/config.h>
-#include <asm/processor.h>
+#include <asm/reg.h>
 #include <asm/page.h>
 #include <platforms/gemini.h>
 #include <asm/ppc_asm.h>

arch/ppc/platforms/pmac_setup.c

@@ -52,7 +52,7 @@
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 
-#include <asm/processor.h>
+#include <asm/reg.h>
 #include <asm/sections.h>
 #include <asm/prom.h>
 #include <asm/system.h>

arch/ppc/platforms/pplus_pci.c

@@ -27,7 +27,6 @@
 #include <asm/ptrace.h>
 #include <asm/pci-bridge.h>
 #include <asm/residual.h>
-#include <asm/processor.h>
 #include <asm/irq.h>
 #include <asm/machdep.h>
 
@@ -529,4 +528,3 @@ pplus_setup_hose(void)
 	ppc_md.pci_swizzle = common_swizzle;
 	pplus_set_board_type();
 }
-

arch/ppc/platforms/pplus_setup.c

@@ -46,7 +46,6 @@
 
 #include <asm/sections.h>
 #include <asm/mmu.h>
-#include <asm/processor.h>
 #include <asm/system.h>
 #include <asm/residual.h>
 #include <asm/io.h>

arch/ppc/platforms/prep_pci.c

@@ -19,7 +19,6 @@
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
 #include <asm/residual.h>
-#include <asm/processor.h>
 #include <asm/irq.h>
 #include <asm/machdep.h>
 #include <asm/open_pic.h>

arch/ppc/platforms/prep_time.c

@@ -24,7 +24,6 @@
 #include <asm/sections.h>
 #include <asm/segment.h>
 #include <asm/io.h>
-#include <asm/processor.h>
 #include <asm/machdep.h>
 #include <asm/prep_nvram.h>
 #include <asm/mk48t59.h>

arch/ppc/platforms/residual.c

@@ -42,7 +42,6 @@
 
 #include <asm/sections.h>
 #include <asm/mmu.h>
-#include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/ide.h>

arch/ppc/syslib/btext.c

@@ -17,7 +17,7 @@
 #include <asm/mmu.h>
 #include <asm/pgtable.h>
 #include <asm/io.h>
-#include <asm/processor.h>
+#include <asm/reg.h>
 
 #define NO_SCROLL
 

arch/ppc/syslib/cpc700_pic.c

@@ -21,7 +21,6 @@
 #include <linux/irq.h>
 
 #include <asm/io.h>
-#include <asm/processor.h>
 #include <asm/system.h>
 #include <asm/irq.h>
 

arch/ppc/syslib/gt64260_pic.c

@@ -41,7 +41,6 @@
 #include <linux/irq.h>
 
 #include <asm/io.h>
-#include <asm/processor.h>
 #include <asm/system.h>
 #include <asm/irq.h>
 #include <asm/gt64260.h>
@@ -240,4 +239,3 @@ gt64260_mask_irq(unsigned int irq)
 		udelay(1);
 	}
 }
-

arch/ppc/syslib/m8260_setup.c

@@ -34,7 +34,6 @@
 #include <linux/seq_file.h>
 
 #include <asm/mmu.h>
-#include <asm/processor.h>
 #include <asm/residual.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
@@ -260,4 +259,3 @@ m8260_init(unsigned long r3, unsigned long r4, unsigned long r5,
 	ppc_md.find_end_of_memory	= m8260_find_end_of_memory;
 	ppc_md.setup_io_mappings	= m8260_map_io;
 }
-

arch/ppc/syslib/m8xx_setup.c

@@ -35,7 +35,7 @@
 #include <linux/root_dev.h>
 
 #include <asm/mmu.h>
-#include <asm/processor.h>
+#include <asm/reg.h>
 #include <asm/residual.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
@@ -221,9 +221,7 @@ m8xx_restart(char *cmd)
 
 	/* Clear the ME bit in MSR to cause checkstop on machine check
 	*/
-	__asm__("mfmsr %0" : "=r" (msr) );
-	msr &= ~0x1000;
-	__asm__("mtmsr %0" : : "r" (msr) );
+	mtmsr(mfmsr(msr) & ~0x1000);
 
 	dummy = ((immap_t *)IMAP_ADDR)->im_clkrst.res[0];
 	printk("Restart failed\n");

arch/ppc/syslib/prep_nvram.c

@@ -17,7 +17,6 @@
 #include <asm/sections.h>
 #include <asm/segment.h>
 #include <asm/io.h>
-#include <asm/processor.h>
 #include <asm/machdep.h>
 #include <asm/prep_nvram.h>
 
@@ -140,6 +139,3 @@ char __prep *prep_nvram_next_var(char *name)
 		return NULL;
 	}
 }
-
-
-

arch/ppc/syslib/prom_init.c

@@ -19,7 +19,6 @@
 #include <asm/sections.h>
 #include <asm/prom.h>
 #include <asm/page.h>
-#include <asm/processor.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/smp.h>

arch/ppc/xmon/start_8xx.c

@@ -12,7 +12,6 @@
 #include <asm/io.h>
 #include <asm/page.h>
 #include <linux/kernel.h>
-#include <asm/processor.h>
 #include <asm/8xx_immap.h>
 #include <asm/mpc8xx.h>
 #include <asm/commproc.h>

include/asm-ppc/cache.h

@@ -6,7 +6,6 @@
 #define __ARCH_PPC_CACHE_H
 
 #include <linux/config.h>
-#include <asm/processor.h>
 
 /* bytes per L1 cache line */
 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)

include/asm-ppc/hw_irq.h

@@ -5,15 +5,14 @@
 #ifndef _PPC_HW_IRQ_H
 #define _PPC_HW_IRQ_H
 
+#include <asm/ptrace.h>
+#include <asm/reg.h>
+
 extern void timer_interrupt(struct pt_regs *);
 extern void ppc_irq_dispatch_handler(struct pt_regs *regs, int irq);
 
 #define INLINE_IRQS
 
-#define mfmsr()		({unsigned int rval; \
-			asm volatile("mfmsr %0" : "=r" (rval)); rval;})
-#define mtmsr(v)	asm volatile("mtmsr %0" : : "r" (v))
-
 #define irqs_disabled()	((mfmsr() & MSR_EE) == 0)
 
 #ifdef INLINE_IRQS

include/asm-ppc/ide.h

@@ -13,7 +13,6 @@
 #ifdef __KERNEL__
 
 #include <linux/sched.h>
-#include <asm/processor.h>
 #include <asm/mpc8xx.h>
 
 #ifndef MAX_HWIFS

include/asm-ppc/pgalloc.h

@@ -4,7 +4,6 @@
 
 #include <linux/config.h>
 #include <linux/threads.h>
-#include <asm/processor.h>
 
 extern void __bad_pte(pmd_t *pmd);
 

include/asm-ppc/serial.h

@@ -37,7 +37,6 @@
  * This is true for PReP and CHRP at least.
  */
 #include <asm/pc_serial.h>
-#include <asm/processor.h>
 
 #if defined(CONFIG_MAC_SERIAL)
 #define SERIAL_DEV_OFFSET	((_machine == _MACH_prep || _machine == _MACH_chrp) ? 0 : 2)

include/asm-ppc/spinlock.h

@@ -2,7 +2,6 @@
 #define __ASM_SPINLOCK_H
 
 #include <asm/system.h>
-#include <asm/processor.h>
 
 /*
  * Simple spin lock operations.

include/asm-ppc/system.h

@@ -7,7 +7,6 @@
 #include <linux/config.h>
 #include <linux/kernel.h>
 
-#include <asm/processor.h>
 #include <asm/atomic.h>
 #include <asm/hw_irq.h>
 
@@ -50,6 +49,9 @@
 #endif /* CONFIG_SMP */
 
 #ifdef __KERNEL__
+struct task_struct;
+struct pt_regs;
+
 extern void print_backtrace(unsigned long *);
 extern void show_regs(struct pt_regs * regs);
 extern void flush_instruction_cache(void);
@@ -83,7 +85,6 @@ extern void cacheable_memzero(void *p, unsigned int nb);
 struct device_node;
 extern void note_scsi_host(struct device_node *, void *);
 
-struct task_struct;
 extern struct task_struct *__switch_to(struct task_struct *,
 	struct task_struct *);
 #define switch_to(prev, next, last)	((last) = __switch_to((prev), (next)))
@@ -94,7 +95,6 @@ extern struct task_struct *_switch(struct thread_struct *prev,
 
 extern unsigned int rtas_data;
 
-struct pt_regs;
 extern void dump_regs(struct pt_regs *);
 
 static __inline__ unsigned long

include/asm-ppc/thread_info.h

@@ -9,9 +9,6 @@
 #define _ASM_THREAD_INFO_H
 
 #ifdef __KERNEL__
-
-#include <asm/processor.h>
-
 #ifndef __ASSEMBLY__
 /*
  * low level task data.

include/asm-ppc/time.h

@@ -13,7 +13,7 @@
 #include <linux/mc146818rtc.h>
 #include <linux/threads.h>
 
-#include <asm/processor.h>
+#include <asm/reg.h>
 
 /* time.c */
 extern unsigned tb_ticks_per_jiffy;

include/asm-ppc/tlbflush.h

@@ -12,7 +12,6 @@
 
 #include <linux/config.h>
 #include <linux/mm.h>
-#include <asm/processor.h>
 
 extern void _tlbie(unsigned long address);
 extern void _tlbia(void);