diff options
author | Tony Luck <tony.luck@intel.com> | 2009-06-17 09:35:24 -0700 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2009-06-17 09:35:24 -0700 |
commit | 27f70c3117194f98beb009dc48bb2aa267f505bf (patch) | |
tree | 22afa3fb31376da9e37f09a78745afe3f16fde8a /arch/ia64/include/asm/sal.h | |
parent | d186b86ffcad713a1dd3d03e9d4ce2d59f61a1ed (diff) | |
parent | e088a4ad7fa53c3dc3c29f930025f41ccf01953e (diff) | |
download | lwn-27f70c3117194f98beb009dc48bb2aa267f505bf.tar.gz lwn-27f70c3117194f98beb009dc48bb2aa267f505bf.zip |
Pull for-2.6.31 into release
Diffstat (limited to 'arch/ia64/include/asm/sal.h')
-rw-r--r-- | arch/ia64/include/asm/sal.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ia64/include/asm/sal.h b/arch/ia64/include/asm/sal.h index 966797a97c94..d19ddba4e327 100644 --- a/arch/ia64/include/asm/sal.h +++ b/arch/ia64/include/asm/sal.h @@ -106,10 +106,10 @@ struct ia64_sal_retval { * informational value should be printed (e.g., "reboot for * change to take effect"). */ - s64 status; - u64 v0; - u64 v1; - u64 v2; + long status; + unsigned long v0; + unsigned long v1; + unsigned long v2; }; typedef struct ia64_sal_retval (*ia64_sal_handler) (u64, ...); |