summaryrefslogtreecommitdiff
path: root/arch/sparc64/prom
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2006-02-20 22:56:01 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-03-20 01:13:48 -0800
commitc79f76777d678ba454aa727800e1386a1fd1f2e8 (patch)
treec93a6f342ae56216e34fb5c5f5782e79dff6c4fc /arch/sparc64/prom
parent4e74ae800bafe79d4aaa529bc5d52425757c0115 (diff)
[SPARC64]: Args to SUNW,set-trap-table are 64-bit.
They were getting truncated to 32-bit and this is very bad when your MMU fault status area is in physical memory above 4GB on SUN4V. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/prom')
-rw-r--r--arch/sparc64/prom/misc.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/sparc64/prom/misc.c b/arch/sparc64/prom/misc.c
index 36d2b9c1622d..90df42141b19 100644
--- a/arch/sparc64/prom/misc.c
+++ b/arch/sparc64/prom/misc.c
@@ -133,12 +133,17 @@ int prom_getprev(void)
/* Install Linux trap table so PROM uses that instead of its own. */
void prom_set_trap_table(unsigned long tba)
{
- p1275_cmd("SUNW,set-trap-table", P1275_INOUT(1, 0), tba);
+ p1275_cmd("SUNW,set-trap-table",
+ (P1275_ARG(0, P1275_ARG_IN_64B) |
+ P1275_INOUT(1, 0)), tba);
}
void prom_set_trap_table_sun4v(unsigned long tba, unsigned long mmfsa)
{
- p1275_cmd("SUNW,set-trap-table", P1275_INOUT(2, 0), tba, mmfsa);
+ p1275_cmd("SUNW,set-trap-table",
+ (P1275_ARG(0, P1275_ARG_IN_64B) |
+ P1275_ARG(1, P1275_ARG_IN_64B) |
+ P1275_INOUT(2, 0)), tba, mmfsa);
}
int prom_get_mmu_ihandle(void)