diff options
| author | Tony Luck <tony.luck@intel.com> | 2006-09-26 09:47:04 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-09-26 09:47:04 -0700 |
| commit | ae3e0218621db0590163b2d5c424ef1f340e3cc6 (patch) | |
| tree | a7e84e4b4a1e32fb64a99d7d5c73420b717f01ae /include/asm-ia64 | |
| parent | e478bec0ba0a83a48a0f6982934b6de079e7e6b3 (diff) | |
| parent | 76d08bb3f09054edc45326ce5c698a3f6c45f5d0 (diff) | |
| download | kernel-crypto-ae3e0218621db0590163b2d5c424ef1f340e3cc6.tar.gz kernel-crypto-ae3e0218621db0590163b2d5c424ef1f340e3cc6.tar.xz kernel-crypto-ae3e0218621db0590163b2d5c424ef1f340e3cc6.zip | |
Pull model-name into release branch
Diffstat (limited to 'include/asm-ia64')
| -rw-r--r-- | include/asm-ia64/pal.h | 10 | ||||
| -rw-r--r-- | include/asm-ia64/processor.h | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/asm-ia64/pal.h b/include/asm-ia64/pal.h index 20a8d618c84..d1587e4f575 100644 --- a/include/asm-ia64/pal.h +++ b/include/asm-ia64/pal.h @@ -78,6 +78,7 @@ #define PAL_VM_TR_READ 261 /* read contents of translation register */ #define PAL_GET_PSTATE 262 /* get the current P-state */ #define PAL_SET_PSTATE 263 /* set the P-state */ +#define PAL_BRAND_INFO 274 /* Processor branding information */ #ifndef __ASSEMBLY__ @@ -1133,6 +1134,15 @@ ia64_pal_set_pstate (u64 pstate_index) return iprv.status; } +/* Processor branding information*/ +static inline s64 +ia64_pal_get_brand_info (char *brand_info) +{ + struct ia64_pal_retval iprv; + PAL_CALL_STK(iprv, PAL_BRAND_INFO, 0, (u64)brand_info, 0); + return iprv.status; +} + /* Cause the processor to enter LIGHT HALT state, where prefetching and execution are * suspended, but cache and TLB coherency is maintained. */ diff --git a/include/asm-ia64/processor.h b/include/asm-ia64/processor.h index 265f4824db0..ead68f8eb88 100644 --- a/include/asm-ia64/processor.h +++ b/include/asm-ia64/processor.h @@ -163,6 +163,7 @@ struct cpuinfo_ia64 { __u8 family; __u8 archrev; char vendor[16]; + char *model_name; #ifdef CONFIG_NUMA struct ia64_node_data *node_data; |