Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f614c817 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'parisc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc fixes from Helge Deller:
 "The patch by Guenter Roeck fixes the build on parisc which got broken
  because of commit f24ffde4 ("parisc: expose number of page table
  levels on Kconfig level") and the patch from Matthew Wilcox converts
  our code to use the generic scatterlist.h header file"

* 'parisc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Replace PT_NLEVELS with CONFIG_PGTABLE_LEVELS
  parisc: Eliminate sg_virt_addr() and private scatterlist.h
parents b8ce8d72 c19edb69

arch/parisc/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ generic-y += param.h 
generic-y += percpu.h

generic-y += poll.h

generic-y += preempt.h

generic-y += scatterlist.h

generic-y += seccomp.h

generic-y += segment.h

generic-y += topology.h

arch/parisc/include/asm/pgalloc.h

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) 


	if (likely(pgd != NULL)) {

		memset(pgd, 0, PAGE_SIZE<<PGD_ALLOC_ORDER);

#if PT_NLEVELS == 3

#if CONFIG_PGTABLE_LEVELS == 3

		actual_pgd += PTRS_PER_PGD;

		/* Populate first pmd with allocated memory.  We mark it

		 * with PxD_FLAG_ATTACHED as a signal to the system that this
@@ -45,7 +45,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) 


static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)

{

#if PT_NLEVELS == 3

#if CONFIG_PGTABLE_LEVELS == 3

	pgd -= PTRS_PER_PGD;

#endif

	free_pages((unsigned long)pgd, PGD_ALLOC_ORDER);
@@ -102,7 +102,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd) 
static inline void

pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, pte_t *pte)

{

#if PT_NLEVELS == 3

#if CONFIG_PGTABLE_LEVELS == 3

	/* preserve the gateway marker if this is the beginning of

	 * the permanent pmd */

	if(pmd_flag(*pmd) & PxD_FLAG_ATTACHED)

arch/parisc/include/asm/scatterlist.h

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
#ifndef _ASM_PARISC_SCATTERLIST_H

#define _ASM_PARISC_SCATTERLIST_H



#include <asm/page.h>

#include <asm/types.h>

#include <asm-generic/scatterlist.h>



#define sg_virt_addr(sg) ((unsigned long)sg_virt(sg))



#endif /* _ASM_PARISC_SCATTERLIST_H */

arch/parisc/kernel/pci-dma.c

+4 −4
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ static int pa11_dma_map_sg(struct device *dev, struct scatterlist *sglist, int n 
	BUG_ON(direction == DMA_NONE);



	for (i = 0; i < nents; i++, sglist++ ) {

		unsigned long vaddr = sg_virt_addr(sglist);

		unsigned long vaddr = (unsigned long)sg_virt(sglist);

		sg_dma_address(sglist) = (dma_addr_t) virt_to_phys(vaddr);

		sg_dma_len(sglist) = sglist->length;

		flush_kernel_dcache_range(vaddr, sglist->length);
@@ -502,7 +502,7 @@ static void pa11_dma_unmap_sg(struct device *dev, struct scatterlist *sglist, in 
	/* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */



	for (i = 0; i < nents; i++, sglist++ )

		flush_kernel_dcache_range(sg_virt_addr(sglist), sglist->length);

		flush_kernel_vmap_range(sg_virt(sglist), sglist->length);

	return;

}
@@ -527,7 +527,7 @@ static void pa11_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sgl 
	/* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */



	for (i = 0; i < nents; i++, sglist++ )

		flush_kernel_dcache_range(sg_virt_addr(sglist), sglist->length);

		flush_kernel_vmap_range(sg_virt(sglist), sglist->length);

}



static void pa11_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sglist, int nents, enum dma_data_direction direction)
@@ -537,7 +537,7 @@ static void pa11_dma_sync_sg_for_device(struct device *dev, struct scatterlist * 
	/* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */



	for (i = 0; i < nents; i++, sglist++ )

		flush_kernel_dcache_range(sg_virt_addr(sglist), sglist->length);

		flush_kernel_vmap_range(sg_virt(sglist), sglist->length);

}



struct hppa_dma_ops pcxl_dma_ops = {

drivers/parisc/ccio-dma.c

+3 −3
Original line number Diff line number Diff line
@@ -916,7 +916,7 @@ ccio_map_sg(struct device *dev, struct scatterlist *sglist, int nents, 
	/* Fast path single entry scatterlists. */

	if (nents == 1) {

		sg_dma_address(sglist) = ccio_map_single(dev,

				(void *)sg_virt_addr(sglist), sglist->length,

				sg_virt(sglist), sglist->length,

				direction);

		sg_dma_len(sglist) = sglist->length;

		return 1;
@@ -983,8 +983,8 @@ ccio_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents, 
	BUG_ON(!dev);

	ioc = GET_IOC(dev);



	DBG_RUN_SG("%s() START %d entries,  %08lx,%x\n",

		__func__, nents, sg_virt_addr(sglist), sglist->length);

	DBG_RUN_SG("%s() START %d entries, %p,%x\n",

		__func__, nents, sg_virt(sglist), sglist->length);



#ifdef CCIO_COLLECT_STATS

	ioc->usg_calls++;