diff options
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/rtas_flash.c | 4 | ||||
-rw-r--r-- | arch/powerpc/mm/hugetlbpage.c | 2 | ||||
-rw-r--r-- | arch/powerpc/mm/init_64.c | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/spufs/inode.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c index b9561d300516..7d0f13fecc0e 100644 --- a/arch/powerpc/kernel/rtas_flash.c +++ b/arch/powerpc/kernel/rtas_flash.c | |||
@@ -101,7 +101,7 @@ struct flash_block_list_header { /* just the header of flash_block_list */ | |||
101 | static struct flash_block_list_header rtas_firmware_flash_list = {0, NULL}; | 101 | static struct flash_block_list_header rtas_firmware_flash_list = {0, NULL}; |
102 | 102 | ||
103 | /* Use slab cache to guarantee 4k alignment */ | 103 | /* Use slab cache to guarantee 4k alignment */ |
104 | static kmem_cache_t *flash_block_cache = NULL; | 104 | static struct kmem_cache *flash_block_cache = NULL; |
105 | 105 | ||
106 | #define FLASH_BLOCK_LIST_VERSION (1UL) | 106 | #define FLASH_BLOCK_LIST_VERSION (1UL) |
107 | 107 | ||
@@ -286,7 +286,7 @@ static ssize_t rtas_flash_read(struct file *file, char __user *buf, | |||
286 | } | 286 | } |
287 | 287 | ||
288 | /* constructor for flash_block_cache */ | 288 | /* constructor for flash_block_cache */ |
289 | void rtas_block_ctor(void *ptr, kmem_cache_t *cache, unsigned long flags) | 289 | void rtas_block_ctor(void *ptr, struct kmem_cache *cache, unsigned long flags) |
290 | { | 290 | { |
291 | memset(ptr, 0, RTAS_BLK_SIZE); | 291 | memset(ptr, 0, RTAS_BLK_SIZE); |
292 | } | 292 | } |
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index 424a8f57e155..89c836d54809 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c | |||
@@ -1047,7 +1047,7 @@ repeat: | |||
1047 | return err; | 1047 | return err; |
1048 | } | 1048 | } |
1049 | 1049 | ||
1050 | static void zero_ctor(void *addr, kmem_cache_t *cache, unsigned long flags) | 1050 | static void zero_ctor(void *addr, struct kmem_cache *cache, unsigned long flags) |
1051 | { | 1051 | { |
1052 | memset(addr, 0, kmem_cache_size(cache)); | 1052 | memset(addr, 0, kmem_cache_size(cache)); |
1053 | } | 1053 | } |
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index 9a178549cbcf..d12a87ec5ae9 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c | |||
@@ -141,7 +141,7 @@ static int __init setup_kcore(void) | |||
141 | } | 141 | } |
142 | module_init(setup_kcore); | 142 | module_init(setup_kcore); |
143 | 143 | ||
144 | static void zero_ctor(void *addr, kmem_cache_t *cache, unsigned long flags) | 144 | static void zero_ctor(void *addr, struct kmem_cache *cache, unsigned long flags) |
145 | { | 145 | { |
146 | memset(addr, 0, kmem_cache_size(cache)); | 146 | memset(addr, 0, kmem_cache_size(cache)); |
147 | } | 147 | } |
@@ -166,9 +166,9 @@ static const char *pgtable_cache_name[ARRAY_SIZE(pgtable_cache_size)] = { | |||
166 | /* Hugepages need one extra cache, initialized in hugetlbpage.c. We | 166 | /* Hugepages need one extra cache, initialized in hugetlbpage.c. We |
167 | * can't put into the tables above, because HPAGE_SHIFT is not compile | 167 | * can't put into the tables above, because HPAGE_SHIFT is not compile |
168 | * time constant. */ | 168 | * time constant. */ |
169 | kmem_cache_t *pgtable_cache[ARRAY_SIZE(pgtable_cache_size)+1]; | 169 | struct kmem_cache *pgtable_cache[ARRAY_SIZE(pgtable_cache_size)+1]; |
170 | #else | 170 | #else |
171 | kmem_cache_t *pgtable_cache[ARRAY_SIZE(pgtable_cache_size)]; | 171 | struct kmem_cache *pgtable_cache[ARRAY_SIZE(pgtable_cache_size)]; |
172 | #endif | 172 | #endif |
173 | 173 | ||
174 | void pgtable_cache_init(void) | 174 | void pgtable_cache_init(void) |
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c index 7edfcc9d2853..e3af9112c026 100644 --- a/arch/powerpc/platforms/cell/spufs/inode.c +++ b/arch/powerpc/platforms/cell/spufs/inode.c | |||
@@ -40,7 +40,7 @@ | |||
40 | 40 | ||
41 | #include "spufs.h" | 41 | #include "spufs.h" |
42 | 42 | ||
43 | static kmem_cache_t *spufs_inode_cache; | 43 | static struct kmem_cache *spufs_inode_cache; |
44 | char *isolated_loader; | 44 | char *isolated_loader; |
45 | 45 | ||
46 | static struct inode * | 46 | static struct inode * |
@@ -65,7 +65,7 @@ spufs_destroy_inode(struct inode *inode) | |||
65 | } | 65 | } |
66 | 66 | ||
67 | static void | 67 | static void |
68 | spufs_init_once(void *p, kmem_cache_t * cachep, unsigned long flags) | 68 | spufs_init_once(void *p, struct kmem_cache * cachep, unsigned long flags) |
69 | { | 69 | { |
70 | struct spufs_inode_info *ei = p; | 70 | struct spufs_inode_info *ei = p; |
71 | 71 | ||