Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] arch/powerpc trivial annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Al Viro and committed by
Linus Torvalds
9340b0d3 ccbebdac

+6 -5
+3 -2
arch/powerpc/platforms/cell/iommu.c
··· 149 149 static void invalidate_tce_cache(struct cbe_iommu *iommu, unsigned long *pte, 150 150 long n_ptes) 151 151 { 152 - unsigned long *reg, val; 152 + unsigned long __iomem *reg; 153 + unsigned long val; 153 154 long n; 154 155 155 156 reg = iommu->xlate_regs + IOC_IOPT_CacheInvd; ··· 593 592 /* Init base fields */ 594 593 i = cbe_nr_iommus++; 595 594 iommu = &iommus[i]; 596 - iommu->stab = 0; 595 + iommu->stab = NULL; 597 596 iommu->nid = nid; 598 597 snprintf(iommu->name, sizeof(iommu->name), "iommu%d", i); 599 598 INIT_LIST_HEAD(&iommu->windows);
+2 -2
arch/powerpc/platforms/chrp/setup.c
··· 75 75 extern unsigned long loops_per_jiffy; 76 76 77 77 /* To be replaced by RTAS when available */ 78 - static unsigned int *briq_SPOR; 78 + static unsigned int __iomem *briq_SPOR; 79 79 80 80 #ifdef CONFIG_SMP 81 81 extern struct smp_ops_t chrp_smp_ops; ··· 267 267 } else if (machine && strncmp(machine, "TotalImpact,BRIQ-1", 18) == 0) { 268 268 _chrp_type = _CHRP_briq; 269 269 /* Map the SPOR register on briq and change the restart hook */ 270 - briq_SPOR = (unsigned int *)ioremap(0xff0000e8, 4); 270 + briq_SPOR = ioremap(0xff0000e8, 4); 271 271 ppc_md.restart = briq_restart; 272 272 } else { 273 273 /* Let's assume it is an IBM chrp if all else fails */
+1 -1
arch/powerpc/xmon/spu-dis.c
··· 85 85 if ((index = spu_disassemble_table[opcode & 0x7ff]) != 0) 86 86 return index; 87 87 88 - return 0; 88 + return NULL; 89 89 } 90 90 91 91 /* Print a Spu instruction. */