linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Catalin Marinas <catalin.marinas@arm.com>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 11/20] ARM: LPAE: Remove the FIRST_USER_PGD_NR and USER_PTRS_PER_PGD definitions
Date: Mon, 15 Nov 2010 17:40:20 +0000	[thread overview]
Message-ID: <1289842829-3027-12-git-send-email-catalin.marinas@arm.com> (raw)
In-Reply-To: <1289842829-3027-1-git-send-email-catalin.marinas@arm.com>

These macros were only used in setup_mm_for_reboot and get_pgd_slow.
Both have been modified to no longer use these definitions. One of the
reasons is the different meaning that PGD has with the 2-level and
3-level page tables.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---
 arch/arm/include/asm/pgtable-2level.h |    3 ---
 arch/arm/include/asm/pgtable-3level.h |    3 ---
 arch/arm/mm/pgd.c                     |    2 +-
 3 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
index 4e21166..a0548b6 100644
--- a/arch/arm/include/asm/pgtable-2level.h
+++ b/arch/arm/include/asm/pgtable-2level.h
@@ -92,9 +92,6 @@
  */
 #define FIRST_USER_ADDRESS	PAGE_SIZE
 
-#define FIRST_USER_PGD_NR	1
-#define USER_PTRS_PER_PGD	((TASK_SIZE/PGDIR_SIZE) - FIRST_USER_PGD_NR)
-
 /*
  * section address mask and size definitions.
  */
diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
index 5b1482d..381b04b 100644
--- a/arch/arm/include/asm/pgtable-3level.h
+++ b/arch/arm/include/asm/pgtable-3level.h
@@ -58,9 +58,6 @@
  */
 #define FIRST_USER_ADDRESS	PAGE_SIZE
 
-#define FIRST_USER_PGD_NR	1
-#define USER_PTRS_PER_PGD	((TASK_SIZE/PGDIR_SIZE) - FIRST_USER_PGD_NR)
-
 /*
  * section address mask and size definitions.
  */
diff --git a/arch/arm/mm/pgd.c b/arch/arm/mm/pgd.c
index e7c149b..09238fa 100644
--- a/arch/arm/mm/pgd.c
+++ b/arch/arm/mm/pgd.c
@@ -25,7 +25,7 @@
 #else
 #define alloc_pgd()	(pgd_t *)__get_free_pages(GFP_KERNEL, 2)
 #define free_pgd(pgd)	free_pages((unsigned long)pgd, 2)
-#define FIRST_KERNEL_PGD_NR	(FIRST_USER_PGD_NR + USER_PTRS_PER_PGD)
+#define FIRST_KERNEL_PGD_NR	(TASK_SIZE >> PGDIR_SHIFT)
 #endif
 
 /*

  parent reply	other threads:[~2010-11-15 17:41 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-15 17:40 [PATCH v3 00/20] ARM: Add support for the Large Physical Address Extensions Catalin Marinas
2010-11-15 17:40 ` [PATCH v3 01/20] ARM: LPAE: Use PMD_(SHIFT|SIZE|MASK) instead of PGDIR_* Catalin Marinas
2010-11-15 17:40 ` [PATCH v3 02/20] ARM: LPAE: Factor out 2-level page table definitions into separate files Catalin Marinas
2010-11-15 17:40 ` [PATCH v3 03/20] ARM: LPAE: use long long format when printing physical addresses and ptes Catalin Marinas
2010-11-15 17:40 ` [PATCH v3 04/20] ARM: LPAE: use u32 instead of unsigned long for 32-bit ptes Catalin Marinas
2010-11-15 17:40 ` [PATCH v3 05/20] ARM: LPAE: Do not assume Linux PTEs are always at PTRS_PER_PTE offset Catalin Marinas
2010-11-15 17:40 ` [PATCH v3 06/20] ARM: LPAE: Introduce L_PTE_NOEXEC and L_PTE_NOWRITE Catalin Marinas
2010-11-15 17:40 ` [PATCH v3 07/20] ARM: LPAE: Introduce the 3-level page table format definitions Catalin Marinas
2010-11-15 17:40 ` [PATCH v3 08/20] ARM: LPAE: Page table maintenance for the 3-level format Catalin Marinas
2010-11-15 17:40 ` [PATCH v3 09/20] ARM: LPAE: MMU setup for the 3-level page table format Catalin Marinas
2010-11-15 17:40 ` [PATCH v3 10/20] ARM: LPAE: Change setup_mm_for_reboot() to work with LPAE Catalin Marinas
2010-11-15 17:40 ` Catalin Marinas [this message]
2010-11-15 17:40 ` [PATCH v3 12/20] ARM: LPAE: Add fault handling support Catalin Marinas
2010-11-15 17:40 ` [PATCH v3 13/20] ARM: LPAE: Add context switching support Catalin Marinas
2010-11-15 17:40 ` [PATCH v3 14/20] ARM: LPAE: Add SMP support for the 3-level page table format Catalin Marinas
2010-11-15 17:40 ` [PATCH v3 15/20] ARM: LPAE: use phys_addr_t instead of unsigned long for physical addresses Catalin Marinas
2010-11-16 19:14   ` Stephen Boyd
2010-11-16 19:33     ` Russell King - ARM Linux
2010-11-17 10:47       ` Catalin Marinas
2010-11-17 11:18         ` Arnd Bergmann
2010-11-17 15:28           ` Catalin Marinas
2010-11-17 15:40             ` Arnd Bergmann
2010-11-15 17:40 ` [PATCH v3 16/20] ARM: LPAE: Use generic dma_addr_t type definition Catalin Marinas
2010-11-15 17:40 ` [PATCH v3 17/20] ARM: LPAE: mark memory banks with start > ULONG_MAX as highmem Catalin Marinas
2010-11-15 17:40 ` [PATCH v3 18/20] ARM: LPAE: use phys_addr_t for physical start address in early_mem Catalin Marinas
2010-11-15 17:40 ` [PATCH v3 19/20] ARM: LPAE: add support for ATAG_MEM64 Catalin Marinas
2010-11-15 17:40 ` [PATCH v3 20/20] ARM: LPAE: Add the Kconfig entries Catalin Marinas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1289842829-3027-12-git-send-email-catalin.marinas@arm.com \
    --to=catalin.marinas@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).