git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
arch
/
alpha
/
kernel
/
sys_ruffian.c
diff --git
a/arch/alpha/kernel/sys_ruffian.c
b/arch/alpha/kernel/sys_ruffian.c
index
5b99cf3
..
78c30de
100644
(file)
--- a/
arch/alpha/kernel/sys_ruffian.c
+++ b/
arch/alpha/kernel/sys_ruffian.c
@@
-182,16
+182,16
@@
static unsigned long __init
ruffian_get_bank_size(unsigned long offset)
{
unsigned long bank_addr, bank, ret = 0;
ruffian_get_bank_size(unsigned long offset)
{
unsigned long bank_addr, bank, ret = 0;
-
+
/* Valid offsets are: 0x800, 0x840 and 0x880
since Ruffian only uses three banks. */
bank_addr = (unsigned long)PYXIS_MCR + offset;
bank = *(vulp)bank_addr;
/* Valid offsets are: 0x800, 0x840 and 0x880
since Ruffian only uses three banks. */
bank_addr = (unsigned long)PYXIS_MCR + offset;
bank = *(vulp)bank_addr;
-
+
/* Check BANK_ENABLE */
if (bank & 0x01) {
static unsigned long size[] __initdata = {
/* Check BANK_ENABLE */
if (bank & 0x01) {
static unsigned long size[] __initdata = {
- 0x40000000UL, /* 0x00, 1G */
+ 0x40000000UL, /* 0x00, 1G */
0x20000000UL, /* 0x02, 512M */
0x10000000UL, /* 0x04, 256M */
0x08000000UL, /* 0x06, 128M */
0x20000000UL, /* 0x02, 512M */
0x10000000UL, /* 0x04, 256M */
0x08000000UL, /* 0x06, 128M */
@@
-203,7
+203,7
@@
ruffian_get_bank_size(unsigned long offset)
};
bank = (bank & 0x1e) >> 1;
};
bank = (bank & 0x1e) >> 1;
- if (bank <
ARRAY_SIZE(
size))
+ if (bank <
sizeof(size)/sizeof(*
size))
ret = size[bank];
}
ret = size[bank];
}