diff options
| author | Bruce Losure <blosure@sgi.com> | 2005-03-24 12:28:00 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-03 11:58:37 -0700 |
| commit | c2d1d65ad441c8abe624bdb1c2cff2e47c8c1ee1 (patch) | |
| tree | 3d88b27fe6409d1ebc9849e29b0e660d437decce | |
| parent | 2074615a13a4f250e0a4e3f6ec8e3733b950a783 (diff) | |
| download | blackbird-op-linux-c2d1d65ad441c8abe624bdb1c2cff2e47c8c1ee1.tar.gz blackbird-op-linux-c2d1d65ad441c8abe624bdb1c2cff2e47c8c1ee1.zip | |
[IA64-SGI] Altix only: Remove hubdev SAL call
Hi Tony,
This patch against ia64-test-2.6.12 fixes a bug where the tiocx code
was inadvertently un-doing some address modifications done in earlier
fixup code. This patch just removes the offending code.
Signed-off-by: Bruce Losure <blosure@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/sn/kernel/tiocx.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c index 66190d7e492d..128ccf23973a 100644 --- a/arch/ia64/sn/kernel/tiocx.c +++ b/arch/ia64/sn/kernel/tiocx.c @@ -330,19 +330,6 @@ EXPORT_SYMBOL(tiocx_bus_type); EXPORT_SYMBOL(tiocx_dma_addr); EXPORT_SYMBOL(tiocx_swin_base); -static uint64_t tiocx_get_hubdev_info(u64 handle, u64 address) -{ - - struct ia64_sal_retval ret_stuff; - ret_stuff.status = 0; - ret_stuff.v0 = 0; - - ia64_sal_oemcall_nolock(&ret_stuff, - SN_SAL_IOIF_GET_HUBDEV_INFO, - handle, address, 0, 0, 0, 0, 0); - return ret_stuff.v0; -} - static void tio_conveyor_set(nasid_t nasid, int enable_flag) { uint64_t ice_frz; @@ -477,18 +464,12 @@ static int __init tiocx_init(void) if (nasid & 0x1) { /* TIO's are always odd */ struct hubdev_info *hubdev; - uint64_t status; struct xwidget_info *widgetp; DBG("Found TIO at nasid 0x%x\n", nasid); hubdev = (struct hubdev_info *)(NODEPDA(cnodeid)->pdinfo); - status = - tiocx_get_hubdev_info(nasid, - (uint64_t) __pa(hubdev)); - if (status) - continue; widgetp = &hubdev->hdi_xwidget_info[TIOCX_CORELET]; |
