sparc32: Trivial removal of sun4c references in comments. (ee906c9e) · Commits · 戴 / test

arch/sparc/include/asm/dma.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -123,8 +123,7 @@ BTFIXUPDEF_CALL(void, mmu_release_scsi_sgl, struct device *, struct scatterlist
		* Second mapping is for device visible address, or "bus" address.
		* The bus address is returned at '*pba'.
		*
		* These functions seem distinct, but are hard to split. On sun4c,
		* at least for now, 'a' is equal to bus address, and retured in *pba.
		* These functions seem distinct, but are hard to split.
		* On sun4m, page attributes depend on the CPU type, so we have to
		* know if we are mapping RAM or I/O, so it has to be an additional argument
		* to a separate mapping function for CPU visible mappings.

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ struct Sun_Machine_Models {
		* ---------------
		* 7 4 3 0
		*
		* The ARCH field determines the architecture line (sun4, sun4c, etc).
		* The ARCH field determines the architecture line (sun4m, etc).
		* The MACH field determines the machine make within that architecture.
		*/

+1 −5

Original line number	Diff line number	Diff line
		@@ -304,8 +304,7 @@ BTFIXUPDEF_CALL(pte_t , pte_offset_kernel, pmd_t , unsigned long)
		#define pte_offset_kernel(dir,addr) BTFIXUP_CALL(pte_offset_kernel)(dir,addr)

		/*
		* This shortcut works on sun4m (and sun4d) because the nocache area is static,
		* and sun4c is guaranteed to have no highmem anyway.
		* This shortcut works on sun4m (and sun4d) because the nocache area is static.
		*/
		#define pte_offset_map(d, a) pte_offset_kernel(d,a)
		#define pte_unmap(pte) do{}while(0)
		@@ -367,7 +366,6 @@ static inline pte_t pgoff_to_pte(unsigned long pgoff)

		/*
		* This is made a constant because mm/fremap.c required a constant.
		* Note that layout of these bits is different between sun4c.c and srmmu.c.
		*/
		#define PTE_FILE_MAX_BITS 24

		@@ -471,10 +469,8 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma,
		#endif /* !(__ASSEMBLY__) */

		#define VMALLOC_START _AC(0xfe600000,UL)
		/* XXX Alter this when I get around to fixing sun4c - Anton */
		#define VMALLOC_END _AC(0xffc00000,UL)


		/* We provide our own get_unmapped_area to cope with VA holes for userland */
		#define HAVE_ARCH_UNMAPPED_AREA

+0 −5

Original line number	Diff line number	Diff line
		@@ -381,11 +381,6 @@ static int sbus_map_sg(struct device dev, struct scatterlist sg, int n,
		enum dma_data_direction dir, struct dma_attrs *attrs)
		{
		mmu_get_scsi_sgl(dev, sg, n);

		/*
		* XXX sparc64 can return a partial length here. sun4c should do this
		* but it currently panics if it can't fulfill the request - Anton
		*/
		return n;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ void handler_irq(unsigned int pil, struct pt_regs *regs);
		/* Dave Redman (djhr@tadpole.co.uk)
		* changed these to function pointers.. it saves cycles and will allow
		* the irq dependencies to be split into different files at a later date
		* sun4c_irq.c, sun4m_irq.c etc so we could reduce the kernel size.
		* sun4m_irq.c etc so we could reduce the kernel size.
		* Jakub Jelinek (jj@sunsite.mff.cuni.cz)
		* Changed these to btfixup entities... It saves cycles :)
		*/