mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 21:54:34 -04:00
ppc: Various minor compile fixes
This fixes up a variety of minor problems in compiling with ARCH=ppc arising from using the merged versions of various header files. A lot of the changes are just adding #include <asm/machdep.h> to files that use ppc_md or smp_ops_t. This also arranges for us to use semaphore.c, vecemu.c, vector.S and fpu.S from arch/powerpc/kernel when compiling with ARCH=ppc. Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
35d81a4bfe
commit
fd582ec88e
35 changed files with 78 additions and 15 deletions
|
|
@ -74,7 +74,9 @@
|
|||
#define MSR_DR __MASK(MSR_DR_LG) /* Data Relocate */
|
||||
#define MSR_PE __MASK(MSR_PE_LG) /* Protection Enable */
|
||||
#define MSR_PX __MASK(MSR_PX_LG) /* Protection Exclusive Mode */
|
||||
#ifndef MSR_PMM
|
||||
#define MSR_PMM __MASK(MSR_PMM_LG) /* Performance monitor */
|
||||
#endif
|
||||
#define MSR_RI __MASK(MSR_RI_LG) /* Recoverable Exception */
|
||||
#define MSR_LE __MASK(MSR_LE_LG) /* Little Endian */
|
||||
|
||||
|
|
@ -87,11 +89,13 @@
|
|||
|
||||
#else /* 32-bit */
|
||||
/* Default MSR for kernel mode. */
|
||||
#ifndef MSR_KERNEL /* reg_booke.h also defines this */
|
||||
#ifdef CONFIG_APUS_FAST_EXCEPT
|
||||
#define MSR_KERNEL (MSR_ME|MSR_IP|MSR_RI|MSR_IR|MSR_DR)
|
||||
#else
|
||||
#define MSR_KERNEL (MSR_ME|MSR_RI|MSR_IR|MSR_DR)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define MSR_USER (MSR_KERNEL|MSR_PR|MSR_EE)
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -77,6 +77,7 @@ extern void enable_kernel_fp(void);
|
|||
extern void enable_kernel_altivec(void);
|
||||
extern void giveup_altivec(struct task_struct *);
|
||||
extern void load_up_altivec(struct task_struct *);
|
||||
extern int emulate_altivec(struct pt_regs *);
|
||||
extern void giveup_spe(struct task_struct *);
|
||||
extern void load_up_spe(struct task_struct *);
|
||||
extern int fix_alignment(struct pt_regs *);
|
||||
|
|
@ -89,6 +90,8 @@ extern int do_page_fault(struct pt_regs *, unsigned long, unsigned long);
|
|||
extern void bad_page_fault(struct pt_regs *, unsigned long, int);
|
||||
extern int die(const char *, struct pt_regs *, long);
|
||||
extern void _exception(int, struct pt_regs *, int, unsigned long);
|
||||
void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val);
|
||||
|
||||
#ifdef CONFIG_BOOKE_WDT
|
||||
extern u32 booke_wdt_enabled;
|
||||
extern u32 booke_wdt_period;
|
||||
|
|
|
|||
Loading…
Reference in a new issue