Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1d59483aecb5bc80bdd677a46e77515a733c1a6f

Authored by Jon Loeliger
Committed by Kumar Gala
1 parent 70f782e148

[POWERPC] Add _nmask_and_or_msr() declartion to asm-powerpc/system.h 

Prevents miscellaneous users from declaring it locally.

Signed-off-by: Jon Loeliger <jdl@freecale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
Diff comments   View file @ 1d59483
... ... @@ -53,8 +53,6 @@
53 53  
54 54 #define MPC7448HPC2_PCI_CFG_PHYS 0xfb000000
55 55  
56   -extern void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val);
57   -
58 56 int mpc7448_hpc2_exclude_device(struct pci_controller *hose,
59 57 u_char bus, u_char devfn)
60 58 {
include/asm-powerpc/system.h
Diff comments   View file @ 1d59483
... ... @@ -169,6 +169,8 @@
169 169 extern void bad_page_fault(struct pt_regs *, unsigned long, int);
170 170 extern int die(const char *, struct pt_regs *, long);
171 171 extern void _exception(int, struct pt_regs *, int, unsigned long);
  172 +extern void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val);
  173 +
172 174 #ifdef CONFIG_BOOKE_WDT
173 175 extern u32 booke_wdt_enabled;
174 176 extern u32 booke_wdt_period;