diff options
author | David S. Miller <davem@davemloft.net> | 2012-05-12 03:35:45 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-12 03:35:45 -0400 |
commit | ee906c9e0bc9d3cc7fdfe82fb30f3c3c1318c3ef (patch) | |
tree | a33dd677564dd883b9a8c5d20f7b07c395f51ef1 /arch/sparc/include/asm | |
parent | 6e54e9503ea84f2c3571cda7146fb42184f0d7e6 (diff) |
sparc32: Trivial removal of sun4c references in comments.
I left some around, like the ones in the openprom headers, since
we need to think about which pieces of those datastructures and
code we can completely toss now.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include/asm')
-rw-r--r-- | arch/sparc/include/asm/dma.h | 3 | ||||
-rw-r--r-- | arch/sparc/include/asm/machines.h | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/pgtable_32.h | 6 |
3 files changed, 3 insertions, 8 deletions
diff --git a/arch/sparc/include/asm/dma.h b/arch/sparc/include/asm/dma.h index b554927bbaf6..67e017fc9866 100644 --- a/arch/sparc/include/asm/dma.h +++ b/arch/sparc/include/asm/dma.h | |||
@@ -123,8 +123,7 @@ BTFIXUPDEF_CALL(void, mmu_release_scsi_sgl, struct device *, struct scatterlist | |||
123 | * Second mapping is for device visible address, or "bus" address. | 123 | * Second mapping is for device visible address, or "bus" address. |
124 | * The bus address is returned at '*pba'. | 124 | * The bus address is returned at '*pba'. |
125 | * | 125 | * |
126 | * These functions seem distinct, but are hard to split. On sun4c, | 126 | * These functions seem distinct, but are hard to split. |
127 | * at least for now, 'a' is equal to bus address, and retured in *pba. | ||
128 | * On sun4m, page attributes depend on the CPU type, so we have to | 127 | * On sun4m, page attributes depend on the CPU type, so we have to |
129 | * know if we are mapping RAM or I/O, so it has to be an additional argument | 128 | * know if we are mapping RAM or I/O, so it has to be an additional argument |
130 | * to a separate mapping function for CPU visible mappings. | 129 | * to a separate mapping function for CPU visible mappings. |
diff --git a/arch/sparc/include/asm/machines.h b/arch/sparc/include/asm/machines.h index 597c4780be67..fd6ddb05d1b7 100644 --- a/arch/sparc/include/asm/machines.h +++ b/arch/sparc/include/asm/machines.h | |||
@@ -19,7 +19,7 @@ struct Sun_Machine_Models { | |||
19 | * --------------- | 19 | * --------------- |
20 | * 7 4 3 0 | 20 | * 7 4 3 0 |
21 | * | 21 | * |
22 | * The ARCH field determines the architecture line (sun4, sun4c, etc). | 22 | * The ARCH field determines the architecture line (sun4m, etc). |
23 | * The MACH field determines the machine make within that architecture. | 23 | * The MACH field determines the machine make within that architecture. |
24 | */ | 24 | */ |
25 | 25 | ||
diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h index 9f3ab0ab8e82..9de855c0920d 100644 --- a/arch/sparc/include/asm/pgtable_32.h +++ b/arch/sparc/include/asm/pgtable_32.h | |||
@@ -304,8 +304,7 @@ BTFIXUPDEF_CALL(pte_t *, pte_offset_kernel, pmd_t *, unsigned long) | |||
304 | #define pte_offset_kernel(dir,addr) BTFIXUP_CALL(pte_offset_kernel)(dir,addr) | 304 | #define pte_offset_kernel(dir,addr) BTFIXUP_CALL(pte_offset_kernel)(dir,addr) |
305 | 305 | ||
306 | /* | 306 | /* |
307 | * This shortcut works on sun4m (and sun4d) because the nocache area is static, | 307 | * This shortcut works on sun4m (and sun4d) because the nocache area is static. |
308 | * and sun4c is guaranteed to have no highmem anyway. | ||
309 | */ | 308 | */ |
310 | #define pte_offset_map(d, a) pte_offset_kernel(d,a) | 309 | #define pte_offset_map(d, a) pte_offset_kernel(d,a) |
311 | #define pte_unmap(pte) do{}while(0) | 310 | #define pte_unmap(pte) do{}while(0) |
@@ -367,7 +366,6 @@ static inline pte_t pgoff_to_pte(unsigned long pgoff) | |||
367 | 366 | ||
368 | /* | 367 | /* |
369 | * This is made a constant because mm/fremap.c required a constant. | 368 | * This is made a constant because mm/fremap.c required a constant. |
370 | * Note that layout of these bits is different between sun4c.c and srmmu.c. | ||
371 | */ | 369 | */ |
372 | #define PTE_FILE_MAX_BITS 24 | 370 | #define PTE_FILE_MAX_BITS 24 |
373 | 371 | ||
@@ -471,10 +469,8 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma, | |||
471 | #endif /* !(__ASSEMBLY__) */ | 469 | #endif /* !(__ASSEMBLY__) */ |
472 | 470 | ||
473 | #define VMALLOC_START _AC(0xfe600000,UL) | 471 | #define VMALLOC_START _AC(0xfe600000,UL) |
474 | /* XXX Alter this when I get around to fixing sun4c - Anton */ | ||
475 | #define VMALLOC_END _AC(0xffc00000,UL) | 472 | #define VMALLOC_END _AC(0xffc00000,UL) |
476 | 473 | ||
477 | |||
478 | /* We provide our own get_unmapped_area to cope with VA holes for userland */ | 474 | /* We provide our own get_unmapped_area to cope with VA holes for userland */ |
479 | #define HAVE_ARCH_UNMAPPED_AREA | 475 | #define HAVE_ARCH_UNMAPPED_AREA |
480 | 476 | ||