git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus
[pandora-kernel.git]
/
arch
/
sparc
/
mm
/
srmmu.c
diff --git
a/arch/sparc/mm/srmmu.c
b/arch/sparc/mm/srmmu.c
index
b0b43aa
..
92319aa
100644
(file)
--- a/
arch/sparc/mm/srmmu.c
+++ b/
arch/sparc/mm/srmmu.c
@@
-1262,7
+1262,8
@@
extern unsigned long bootmem_init(unsigned long *pages_avail);
void __init srmmu_paging_init(void)
{
void __init srmmu_paging_init(void)
{
- int i, cpunode;
+ int i;
+ phandle cpunode;
char node_str[128];
pgd_t *pgd;
pmd_t *pmd;
char node_str[128];
pgd_t *pgd;
pmd_t *pmd;
@@
-1398,7
+1399,8
@@
static void __init srmmu_is_bad(void)
static void __init init_vac_layout(void)
{
static void __init init_vac_layout(void)
{
- int nd, cache_lines;
+ phandle nd;
+ int cache_lines;
char node_str[128];
#ifdef CONFIG_SMP
int cpu = 0;
char node_str[128];
#ifdef CONFIG_SMP
int cpu = 0;
@@
-2082,7
+2084,7
@@
static void __init get_srmmu_type(void)
/* Next check for Fujitsu Swift. */
if(psr_typ == 0 && psr_vers == 4) {
/* Next check for Fujitsu Swift. */
if(psr_typ == 0 && psr_vers == 4) {
-
int
cpunode;
+
phandle
cpunode;
char node_str[128];
/* Look if it is not a TurboSparc emulating Swift... */
char node_str[128];
/* Look if it is not a TurboSparc emulating Swift... */