lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '85xx' into for_paulus

Browse Source
This commit is contained in:
Kumar Gala
2007-02-09 11:42:11 -06:00
parent 8500adc79b 862a728498
commit 8f68abbfd9
5 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/mm/pgtable_32.c
View File

@@ -295,7 +295,7 @@ void __init mapin_ram(void)
} }
/* is x a power of 4? */ /* is x a power of 4? */
#define is_power_of_4(x) is_power_of_2(x) && (ffs(x) & 1)) #define is_power_of_4(x) is_power_of_2(x) && (ffs(x) & 1)
/* /*
* Set up a mapping for a block of I/O. * Set up a mapping for a block of I/O.

7
arch/powerpc/platforms/85xx/mpc85xx_ads.c
View File

@@ -45,8 +45,7 @@ unsigned long isa_mem_base = 0;
#endif #endif
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
int static int mpc85xx_exclude_device(u_char bus, u_char devfn)
mpc85xx_exclude_device(u_char bus, u_char devfn)
{ {
if (bus == 0 && PCI_SLOT(devfn) == 0) if (bus == 0 && PCI_SLOT(devfn) == 0)
return PCIBIOS_DEVICE_NOT_FOUND; return PCIBIOS_DEVICE_NOT_FOUND;
@@ -69,7 +68,7 @@ static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
#endif /* CONFIG_CPM2 */ #endif /* CONFIG_CPM2 */
void __init mpc85xx_ads_pic_init(void) static void __init mpc85xx_ads_pic_init(void)
{ {
struct mpic *mpic; struct mpic *mpic;
struct resource r; struct resource r;
@@ -254,7 +253,7 @@ static void __init mpc85xx_ads_setup_arch(void)
#endif #endif
} }
void mpc85xx_ads_show_cpuinfo(struct seq_file *m) static void mpc85xx_ads_show_cpuinfo(struct seq_file *m)
{ {
uint pvid, svid, phid1; uint pvid, svid, phid1;
uint memsize = total_memory; uint memsize = total_memory;

17
arch/powerpc/platforms/85xx/mpc85xx_cds.c
View File

@@ -56,7 +56,6 @@ unsigned long isa_mem_base = 0;
static int cds_pci_slot = 2; static int cds_pci_slot = 2;
static volatile u8 *cadmus; static volatile u8 *cadmus;
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
#define ARCADIA_HOST_BRIDGE_IDSEL 17 #define ARCADIA_HOST_BRIDGE_IDSEL 17
@@ -64,8 +63,7 @@ static volatile u8 *cadmus;
extern int mpc85xx_pci2_busno; extern int mpc85xx_pci2_busno;
int static int mpc85xx_exclude_device(u_char bus, u_char devfn)
mpc85xx_exclude_device(u_char bus, u_char devfn)
{ {
if (bus == 0 && PCI_SLOT(devfn) == 0) if (bus == 0 && PCI_SLOT(devfn) == 0)
return PCIBIOS_DEVICE_NOT_FOUND; return PCIBIOS_DEVICE_NOT_FOUND;
@@ -81,8 +79,7 @@ mpc85xx_exclude_device(u_char bus, u_char devfn)
return PCIBIOS_SUCCESSFUL; return PCIBIOS_SUCCESSFUL;
} }
void __init static void __init mpc85xx_cds_pcibios_fixup(void)
mpc85xx_cds_pcibios_fixup(void)
{ {
struct pci_dev *dev; struct pci_dev *dev;
u_char c; u_char c;
@@ -144,7 +141,7 @@ static void mpc85xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
#endif /* PPC_I8259 */ #endif /* PPC_I8259 */
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
void __init mpc85xx_cds_pic_init(void) static void __init mpc85xx_cds_pic_init(void)
{ {
struct mpic *mpic; struct mpic *mpic;
struct resource r; struct resource r;
@@ -224,12 +221,10 @@ void __init mpc85xx_cds_pic_init(void)
#endif /* CONFIG_PPC_I8259 */ #endif /* CONFIG_PPC_I8259 */
} }
/* /*
* Setup the architecture * Setup the architecture
*/ */
static void __init static void __init mpc85xx_cds_setup_arch(void)
mpc85xx_cds_setup_arch(void)
{ {
struct device_node *cpu; struct device_node *cpu;
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
@@ -276,9 +271,7 @@ mpc85xx_cds_setup_arch(void)
#endif #endif
} }
static void mpc85xx_cds_show_cpuinfo(struct seq_file *m)
void
mpc85xx_cds_show_cpuinfo(struct seq_file *m)
{ {
uint pvid, svid, phid1; uint pvid, svid, phid1;
uint memsize = total_memory; uint memsize = total_memory;

2
arch/ppc/kernel/ppc_ksyms.c
View File

@@ -271,7 +271,7 @@ EXPORT_SYMBOL(mmu_hash_lock); /* For MOL */
extern long *intercept_table; extern long *intercept_table;
EXPORT_SYMBOL(intercept_table); EXPORT_SYMBOL(intercept_table);
#endif /* CONFIG_PPC_STD_MMU */ #endif /* CONFIG_PPC_STD_MMU */
#if defined(CONFIG_40x) || defined(CONFIG_BOOKE) #ifdef CONFIG_PPC_DCR_NATIVE
EXPORT_SYMBOL(__mtdcr); EXPORT_SYMBOL(__mtdcr);
EXPORT_SYMBOL(__mfdcr); EXPORT_SYMBOL(__mfdcr);
#endif #endif

2
arch/ppc/mm/pgtable.c
View File

@@ -314,7 +314,7 @@ void __init mapin_ram(void)
} }
/* is x a power of 4? */ /* is x a power of 4? */
#define is_power_of_4(x) is_power_of_2(x) && (ffs(x) & 1)) #define is_power_of_4(x) is_power_of_2(x) && (ffs(x) & 1)
/* /*
* Set up a mapping for a block of I/O. * Set up a mapping for a block of I/O.