diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-26 16:20:49 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-26 16:20:49 +1000 |
| commit | 51a0885ed7f883758462926b35fbd6f09f9c717c (patch) | |
| tree | 3789f94f7b599222bef32dc20dc2213b9cf9d948 /include | |
| parent | 14cf11af6cf608eb8c23e989ddb17a715ddce109 (diff) | |
| parent | 3d8a66cc9ec475baaf22de139deff67ffe8e7cf2 (diff) | |
Merge refs/heads/devtree from rsync://oak/kernels/iseries/work/.git
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc64/mmu.h | 4 | ||||
| -rw-r--r-- | include/asm-ppc64/processor.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-ppc64/mmu.h b/include/asm-ppc64/mmu.h index d2b0b796d35..e0505acb77d 100644 --- a/include/asm-ppc64/mmu.h +++ b/include/asm-ppc64/mmu.h @@ -206,6 +206,10 @@ extern long native_hpte_insert(unsigned long hpte_group, unsigned long va, unsigned long prpn, unsigned long vflags, unsigned long rflags); +extern long iSeries_hpte_bolt_or_insert(unsigned long hpte_group, + unsigned long va, unsigned long prpn, + unsigned long vflags, unsigned long rflags); + extern void stabs_alloc(void); #endif /* __ASSEMBLY__ */ diff --git a/include/asm-ppc64/processor.h b/include/asm-ppc64/processor.h index e5fc18531ec..6447fbee7d6 100644 --- a/include/asm-ppc64/processor.h +++ b/include/asm-ppc64/processor.h @@ -291,6 +291,7 @@ #define IC_OPEN_PIC 1 #define IC_PPC_XIC 2 #define IC_BPA_IIC 3 +#define IC_ISERIES 4 #define XGLUE(a,b) a##b #define GLUE(a,b) XGLUE(a,b) |