fix bogus address dereference in sn/setup.c
PATCH 1/1 fix bogus address dereference in sn/setup.c
Some code in sn/setup.c was trying to dereference a physical address, which usually doesn't work (esp. not with the region register init patch I posted). This patch converts the function used to find the klconfig to return virtual char * instead of a physical address and updates the caller to deal with it.
Signed-off-by Jesse Barnes <[email protected]>
Thanks,
Jesse
===== arch/ia64/sn/kernel/setup.c 1.43 vs edited =====
arch/ia64/sn/kernel/setup.c +4 -4
@@ -503,15 +503,15 @@/* Setup ionodes with memory */ for (nasid =0 ; nasid <MAX_PHYSNODE_ID ; nasid +=2 ) { -u64 klgraph_header; +char *klgraph_header;cnodeid_t cnodeid;if (physical_node_map[nasid] ==-1 )continue ; - klgraph_header = cnodeid =-1 ; - klgraph_header =ia64_sn_get_klconfig_addr (nasid); -if (klgraph_header <=0 ) { + cnodeid =-1 ; + klgraph_header =__va (ia64_sn_get_klconfig_addr (nasid)); +if (!klgraph_header) {if (IS_RUNNING_ON_SIMULATOR ())continue ;BUG ();/* All nodes must have klconfig tables! */
===== include/asm-ia64/sn/sn_sal.h 1.17 vs edited =====
include/asm-ia64/sn/sn_sal.h +2 -2
@@ -203,7 +203,7 @@return ret_stuff.v0; } -static inline u64 +static inline char *ia64_sn_get_klconfig_addr (nasid_t nasid) {struct ia64_sal_retval ret_stuff;
@@ -223,7 +223,7 @@if (ret_stuff.status !=0 ) {panic ("ia64_sn_get_klconfig_addr: Returned error %lx\n" , ret_stuff.status); } -return (ret_stuff.v0); +return ret_stuff.v0 ?__va (ret_stuff.v0) :NULL ; }/*