[PATCH] arch/powerpc trivial annotations (9340b0d3) · Commits · 戴 / test

arch/powerpc/platforms/cell/iommu.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -149,7 +149,8 @@ static int cbe_nr_iommus;
		static void invalidate_tce_cache(struct cbe_iommu iommu, unsigned long pte,
		long n_ptes)
		{
		unsigned long *reg, val;
		unsigned long __iomem *reg;
		unsigned long val;
		long n;

		reg = iommu->xlate_regs + IOC_IOPT_CacheInvd;
		@@ -592,7 +593,7 @@ static void __init cell_iommu_init_one(struct device_node *np, unsigned long off
		/* Init base fields */
		i = cbe_nr_iommus++;
		iommu = &iommus[i];
		iommu->stab = 0;
		iommu->stab = NULL;
		iommu->nid = nid;
		snprintf(iommu->name, sizeof(iommu->name), "iommu%d", i);
		INIT_LIST_HEAD(&iommu->windows);

+2 −2

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ extern irqreturn_t xmon_irq(int, void *);
		extern unsigned long loops_per_jiffy;

		/* To be replaced by RTAS when available */
		static unsigned int *briq_SPOR;
		static unsigned int __iomem *briq_SPOR;

		#ifdef CONFIG_SMP
		extern struct smp_ops_t chrp_smp_ops;
		@@ -267,7 +267,7 @@ void __init chrp_setup_arch(void)
		} else if (machine && strncmp(machine, "TotalImpact,BRIQ-1", 18) == 0) {
		_chrp_type = _CHRP_briq;
		/* Map the SPOR register on briq and change the restart hook */
		briq_SPOR = (unsigned int *)ioremap(0xff0000e8, 4);
		briq_SPOR = ioremap(0xff0000e8, 4);
		ppc_md.restart = briq_restart;
		} else {
		/* Let's assume it is an IBM chrp if all else fails */

+1 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ get_index_for_opcode (unsigned int insn)
		if ((index = spu_disassemble_table[opcode & 0x7ff]) != 0)
		return index;

		return 0;
		return NULL;
		}

		/* Print a Spu instruction. */