From 6deb6f9129591a2386f5c125d54a22ab78fc8b61 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Wed, 21 Nov 2007 15:34:02 +0900 Subject: [PATCH] sh: Move PXSEG comments to addrspace.h. Signed-off-by: Paul Mundt --- include/asm-sh/addrspace.h | 8 ++++++++ include/asm-sh/page.h | 16 ---------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/include/asm-sh/addrspace.h b/include/asm-sh/addrspace.h index cb9da9992fa0..e7f2deb28e06 100644 --- a/include/asm-sh/addrspace.h +++ b/include/asm-sh/addrspace.h @@ -17,6 +17,14 @@ /* If this CPU supports segmentation, hook up the helpers */ #ifdef P1SEG +/* + [ P0/U0 (virtual) ] 0x00000000 <------ User space + [ P1 (fixed) cached ] 0x80000000 <------ Kernel space + [ P2 (fixed) non-cachable] 0xA0000000 <------ Physical access + [ P3 (virtual) cached] 0xC0000000 <------ vmalloced area + [ P4 control ] 0xE0000000 + */ + /* Returns the privileged segment base of a given address */ #define PXSEG(a) (((unsigned long)(a)) & 0xe0000000) diff --git a/include/asm-sh/page.h b/include/asm-sh/page.h index cdaacefe509b..407bf5a14936 100644 --- a/include/asm-sh/page.h +++ b/include/asm-sh/page.h @@ -5,14 +5,6 @@ * Copyright (C) 1999 Niibe Yutaka */ -/* - [ P0/U0 (virtual) ] 0x00000000 <------ User space - [ P1 (fixed) cached ] 0x80000000 <------ Kernel space - [ P2 (fixed) non-cachable] 0xA0000000 <------ Physical access - [ P3 (virtual) cached] 0xC0000000 <------ vmalloced area - [ P4 control ] 0xE0000000 - */ - #ifdef __KERNEL__ /* PAGE_SHIFT determines the page size */ @@ -115,14 +107,6 @@ typedef struct { unsigned long pgd; } pgd_t; /* to align the pointer to the (next) page boundary */ #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) -/* - * IF YOU CHANGE THIS, PLEASE ALSO CHANGE - * - * arch/sh/kernel/vmlinux.lds.S - * - * which has the same constant encoded.. - */ - #define __MEMORY_START CONFIG_MEMORY_START #define __MEMORY_SIZE CONFIG_MEMORY_SIZE -- 2.20.1