aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-02-12 21:28:00 -0500
committerPaul Mackerras <paulus@samba.org>2007-02-12 21:28:00 -0500
commitfe6af6faec078ec8137631f24cb541f9918244f0 (patch)
treea0982a904578f0f6ea0bc4113e9de6bbfbe45e43 /arch/ppc
parentec2f9d1331f658433411c58077871e1eef4ee1b4 (diff)
parent8f68abbfd9703e58920ff07d314a48654ed0bc3b (diff)
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/kernel/ppc_ksyms.c2
-rw-r--r--arch/ppc/mm/pgtable.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c
index 1f49503317cb..1318b6f4c3df 100644
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
@@ -271,7 +271,7 @@ EXPORT_SYMBOL(mmu_hash_lock); /* For MOL */
271extern long *intercept_table; 271extern long *intercept_table;
272EXPORT_SYMBOL(intercept_table); 272EXPORT_SYMBOL(intercept_table);
273#endif /* CONFIG_PPC_STD_MMU */ 273#endif /* CONFIG_PPC_STD_MMU */
274#if defined(CONFIG_40x) || defined(CONFIG_BOOKE) 274#ifdef CONFIG_PPC_DCR_NATIVE
275EXPORT_SYMBOL(__mtdcr); 275EXPORT_SYMBOL(__mtdcr);
276EXPORT_SYMBOL(__mfdcr); 276EXPORT_SYMBOL(__mfdcr);
277#endif 277#endif
diff --git a/arch/ppc/mm/pgtable.c b/arch/ppc/mm/pgtable.c
index 82b06a1ef95d..c023b7298809 100644
--- a/arch/ppc/mm/pgtable.c
+++ b/arch/ppc/mm/pgtable.c
@@ -314,7 +314,7 @@ void __init mapin_ram(void)
314} 314}
315 315
316/* is x a power of 4? */ 316/* is x a power of 4? */
317#define is_power_of_4(x) is_power_of_2(x) && (ffs(x) & 1)) 317#define is_power_of_4(x) is_power_of_2(x) && (ffs(x) & 1)
318 318
319/* 319/*
320 * Set up a mapping for a block of I/O. 320 * Set up a mapping for a block of I/O.