Home » Mailing list archives » git-commits-head » 2009 » April » 3

m68k: merge the mmu and non-mmu versions of pgalloc.h

Previous thread: m68knommu: Fix support for console port other than ttyS0 on mcf.c by Linux Kernel Mailing List on Friday, April 3, 2009 - 11:02 am. (1 message)

Next thread: m68k: merge the mmu and non-mmu versions of fb.h by Linux Kernel Mailing List on Friday, April 3, 2009 - 11:02 am. (1 message)
[view original message]
From: Linux Kernel Mailing List
Subject: m68k: merge the mmu and non-mmu versions of pgalloc.h
Date: Friday, April 3, 2009 - 11:02 am

Gitweb:     http://git.kernel.org/linus/606333d64e06db9ae14b5a025380bc5954b1a6c4
Commit:     606333d64e06db9ae14b5a025380bc5954b1a6c4
Parent:     c8bd42707fc1d8e72e0cc722bdc0c0975b52d958
Author:     Greg Ungerer <gerg@uclinux.org>
AuthorDate: Thu Feb 5 10:01:00 2009 +1000
Committer:  Greg Ungerer <gerg@uclinux.org>
CommitDate: Tue Mar 24 15:17:43 2009 +1000

    m68k: merge the mmu and non-mmu versions of pgalloc.h
    
    Trivial merge of the mmu and non-mmu version of pgalloc.h
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 arch/m68k/include/asm/pgalloc.h    |   20 +++++++++++++++++---
 arch/m68k/include/asm/pgalloc_mm.h |   19 -------------------
 arch/m68k/include/asm/pgalloc_no.h |    6 ------
 3 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/arch/m68k/include/asm/pgalloc.h b/arch/m68k/include/asm/pgalloc.h
index 059cb73..c294aad 100644
--- a/arch/m68k/include/asm/pgalloc.h
+++ b/arch/m68k/include/asm/pgalloc.h
@@ -1,5 +1,19 @@
-#ifdef __uClinux__
-#include "pgalloc_no.h"
+#ifndef M68K_PGALLOC_H
+#define M68K_PGALLOC_H
+
+#include <linux/mm.h>
+#include <linux/highmem.h>
+#include <asm/setup.h>
+
+#ifdef CONFIG_MMU
+#include <asm/virtconvert.h>
+#ifdef CONFIG_SUN3
+#include <asm/sun3_pgalloc.h>
 #else
-#include "pgalloc_mm.h"
+#include <asm/motorola_pgalloc.h>
 #endif
+
+extern void m68k_setup_node(int node);
+#endif
+
+#endif /* M68K_PGALLOC_H */
diff --git a/arch/m68k/include/asm/pgalloc_mm.h b/arch/m68k/include/asm/pgalloc_mm.h
deleted file mode 100644
index 4cb1a57..0000000
--- a/arch/m68k/include/asm/pgalloc_mm.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#ifndef M68K_PGALLOC_H
-#define M68K_PGALLOC_H
-
-#include <linux/mm.h>
-#include <linux/highmem.h>
-#include <asm/setup.h>
-#include <asm/virtconvert.h>
-
-
-#ifdef CONFIG_SUN3
-#include <asm/sun3_pgalloc.h>
-#else
-#include <asm/motorola_pgalloc.h>
-#endif
-
-extern void m68k_setup_node(int ...
[ message continues ]
Previous thread: m68knommu: Fix support for console port other than ttyS0 on mcf.c by Linux Kernel Mailing List on Friday, April 3, 2009 - 11:02 am. (1 message)

Next thread: m68k: merge the mmu and non-mmu versions of fb.h by Linux Kernel Mailing List on Friday, April 3, 2009 - 11:02 am. (1 message)