Merge branch 'master' (7db74a47) · Commits · e / devices / android_kernel_fairphone_FP3

MAINTAINERS

+5 −3

Original line number	Diff line number	Diff line
		@@ -1696,11 +1696,13 @@ M: mtk-manpages@gmx.net
		W: ftp://ftp.kernel.org/pub/linux/docs/manpages
		S: Maintained

		MARVELL MV64340 ETHERNET DRIVER
		MARVELL MV643XX ETHERNET DRIVER
		P: Dale Farnsworth
		M: dale@farnsworth.org
		P: Manish Lachwani
		L: linux-mips@linux-mips.org
		M: mlachwani@mvista.com
		L: netdev@vger.kernel.org
		S: Supported
		S: Odd Fixes for 2.4; Maintained for 2.6.

		MATROX FRAMEBUFFER DRIVER
		P: Petr Vandrovec

+6 −7

Original line number	Diff line number	Diff line
		@@ -295,8 +295,7 @@ static void iommu_release_one(u32 busa, int npages, struct sbus_bus *sbus)
		int ioptex;
		int i;

		if (busa < iommu->start)
		BUG();
		BUG_ON(busa < iommu->start);
		ioptex = (busa - iommu->start) >> PAGE_SHIFT;
		for (i = 0; i < npages; i++) {
		iopte_val(iommu->page_table[ioptex + i]) = 0;
		@@ -340,9 +339,9 @@ static int iommu_map_dma_area(dma_addr_t *pba, unsigned long va,
		iopte_t *first;
		int ioptex;

		if ((va & ~PAGE_MASK) != 0) BUG();
		if ((addr & ~PAGE_MASK) != 0) BUG();
		if ((len & ~PAGE_MASK) != 0) BUG();
		BUG_ON((va & ~PAGE_MASK) != 0);
		BUG_ON((addr & ~PAGE_MASK) != 0);
		BUG_ON((len & ~PAGE_MASK) != 0);

		/* page color = physical address */
		ioptex = bit_map_string_get(&iommu->usemap, len >> PAGE_SHIFT,
		@@ -405,8 +404,8 @@ static void iommu_unmap_dma_area(unsigned long busa, int len)
		unsigned long end;
		int ioptex = (busa - iommu->start) >> PAGE_SHIFT;

		if ((busa & ~PAGE_MASK) != 0) BUG();
		if ((len & ~PAGE_MASK) != 0) BUG();
		BUG_ON((busa & ~PAGE_MASK) != 0);
		BUG_ON((len & ~PAGE_MASK) != 0);

		iopte += ioptex;
		end = busa + len;

+11 −11

Original line number	Diff line number	Diff line
		@@ -280,9 +280,9 @@ static struct sparc64_tick_ops stick_operations __read_mostly = {
		* Since STICK is constantly updating, we have to access it carefully.
		*
		* The sequence we use to read is:
		* 1) read low
		* 2) read high
		* 3) read low again, if it rolled over increment high by 1
		* 1) read high
		* 2) read low
		* 3) read high again, if it rolled re-read both low and high again.
		*
		* Writing STICK safely is also tricky:
		* 1) write low to zero
		@@ -295,18 +295,18 @@ static struct sparc64_tick_ops stick_operations __read_mostly = {
		static unsigned long __hbird_read_stick(void)
		{
		unsigned long ret, tmp1, tmp2, tmp3;
		unsigned long addr = HBIRD_STICK_ADDR;
		unsigned long addr = HBIRD_STICK_ADDR+8;

		__asm__ __volatile__("ldxa [%1] %5, %2\n\t"
		"add %1, 0x8, %1\n\t"
		"ldxa [%1] %5, %3\n\t"
		__asm__ __volatile__("ldxa [%1] %5, %2\n"
		"1:\n\t"
		"sub %1, 0x8, %1\n\t"
		"ldxa [%1] %5, %3\n\t"
		"add %1, 0x8, %1\n\t"
		"ldxa [%1] %5, %4\n\t"
		"cmp %4, %2\n\t"
		"blu,a,pn %%xcc, 1f\n\t"
		" add %3, 1, %3\n"
		"1:\n\t"
		"sllx %3, 32, %3\n\t"
		"bne,a,pn %%xcc, 1b\n\t"
		" mov %4, %2\n\t"
		"sllx %4, 32, %4\n\t"
		"or %3, %4, %0\n\t"
		: "=&r" (ret), "=&r" (addr),
		"=&r" (tmp1), "=&r" (tmp2), "=&r" (tmp3)

+1 −1

Original line number	Diff line number	Diff line
		@@ -2136,7 +2136,7 @@ static int __init b44_init(void)

		/* Setup paramaters for syncing RX/TX DMA descriptors */
		dma_desc_align_mask = ~(dma_desc_align_size - 1);
		dma_desc_sync_size = max(dma_desc_align_size, sizeof(struct dma_desc));
		dma_desc_sync_size = max_t(unsigned int, dma_desc_align_size, sizeof(struct dma_desc));

		return pci_module_init(&b44_driver);
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -1925,8 +1925,8 @@ static void cas_tx(struct net_device dev, struct cas cp,
		u64 compwb = le64_to_cpu(cp->init_block->tx_compwb);
		#endif
		if (netif_msg_intr(cp))
		printk(KERN_DEBUG "%s: tx interrupt, status: 0x%x, %lx\n",
		cp->dev->name, status, compwb);
		printk(KERN_DEBUG "%s: tx interrupt, status: 0x%x, %llx\n",
		cp->dev->name, status, (unsigned long long)compwb);
		/* process all the rings */
		for (ring = 0; ring < N_TX_RINGS; ring++) {
		#ifdef USE_TX_COMPWB