projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
[cascardo/linux.git]
/
arch
/
mips
/
sibyte
/
common
/
cfe.c
diff --git
a/arch/mips/sibyte/common/cfe.c
b/arch/mips/sibyte/common/cfe.c
index
588e180
..
c1a11a1
100644
(file)
--- a/
arch/mips/sibyte/common/cfe.c
+++ b/
arch/mips/sibyte/common/cfe.c
@@
-38,7
+38,7
@@
#define MAX_RAM_SIZE (~0ULL)
#else
#ifdef CONFIG_HIGHMEM
#define MAX_RAM_SIZE (~0ULL)
#else
#ifdef CONFIG_HIGHMEM
-#ifdef CONFIG_
64BIT_PHYS_ADDR
+#ifdef CONFIG_
PHYS_ADDR_T_64BIT
#define MAX_RAM_SIZE (~0ULL)
#else
#define MAX_RAM_SIZE (0xffffffffULL)
#define MAX_RAM_SIZE (~0ULL)
#else
#define MAX_RAM_SIZE (0xffffffffULL)
@@
-49,8
+49,8
@@
#endif
#define SIBYTE_MAX_MEM_REGIONS 8
#endif
#define SIBYTE_MAX_MEM_REGIONS 8
-phys_t board_mem_region_addrs[SIBYTE_MAX_MEM_REGIONS];
-phys_t board_mem_region_sizes[SIBYTE_MAX_MEM_REGIONS];
+phys_
addr_
t board_mem_region_addrs[SIBYTE_MAX_MEM_REGIONS];
+phys_
addr_
t board_mem_region_sizes[SIBYTE_MAX_MEM_REGIONS];
unsigned int board_mem_region_count;
int cfe_cons_handle;
unsigned int board_mem_region_count;
int cfe_cons_handle;
@@
-96,7
+96,7
@@
static void __noreturn cfe_linux_halt(void)
static __init void prom_meminit(void)
{
static __init void prom_meminit(void)
{
- u64 addr, size, type; /* regardless of
64BIT_PHYS_ADDR
*/
+ u64 addr, size, type; /* regardless of
PHYS_ADDR_T_64BIT
*/
int mem_flags = 0;
unsigned int idx;
int rd_flag;
int mem_flags = 0;
unsigned int idx;
int rd_flag;