From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: linux-m68k@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [patch 05/10] m68k: Use _AC() instead of #ifdef __ASSEMBLY__
Date: Sun, 12 Aug 2007 11:40:55 +0200 [thread overview]
Message-ID: <20070812094118.421833149@mail.of.borg> (raw)
In-Reply-To: 20070812094050.522858761@mail.of.borg
[-- Attachment #1: m68k-use-_AC.diff --]
[-- Type: text/plain, Size: 1482 bytes --]
m68k: Use _AC() instead of #ifdef __ASSEMBLY__ hackery when needed, remove
hackery when unused.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
include/asm-m68k/page.h | 8 +++-----
include/asm-m68k/processor.h | 4 ----
2 files changed, 3 insertions(+), 9 deletions(-)
--- a/include/asm-m68k/page.h
+++ b/include/asm-m68k/page.h
@@ -4,17 +4,15 @@
#ifdef __KERNEL__
+#include <linux/const.h>
+
/* PAGE_SHIFT determines the page size */
#ifndef CONFIG_SUN3
#define PAGE_SHIFT (12)
#else
#define PAGE_SHIFT (13)
#endif
-#ifdef __ASSEMBLY__
-#define PAGE_SIZE (1 << PAGE_SHIFT)
-#else
-#define PAGE_SIZE (1UL << PAGE_SHIFT)
-#endif
+#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
#include <asm/setup.h>
--- a/include/asm-m68k/processor.h
+++ b/include/asm-m68k/processor.h
@@ -38,12 +38,8 @@ static inline void wrusp(unsigned long u
#ifndef CONFIG_SUN3
#define TASK_SIZE (0xF0000000UL)
#else
-#ifdef __ASSEMBLY__
-#define TASK_SIZE (0x0E000000)
-#else
#define TASK_SIZE (0x0E000000UL)
#endif
-#endif
/* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
--
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
next prev parent reply other threads:[~2007-08-12 9:45 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-12 9:40 [patch 00/10] m68k patches for 2.6.23-rc2 Geert Uytterhoeven
2007-08-12 9:40 ` [patch 01/10] m68k: <asm/page.h> needs <linux/compiler.h> Geert Uytterhoeven
2007-08-12 9:40 ` [patch 02/10] m68k: Kill superfluous extern Geert Uytterhoeven
2007-08-12 9:40 ` [patch 03/10] m68k: Remove unnecessary m68k_memoffset export and init Geert Uytterhoeven
2007-08-12 9:40 ` [patch 04/10] remove dead code in via-pmu68k Geert Uytterhoeven
2007-08-12 9:40 ` Geert Uytterhoeven [this message]
2007-08-12 9:40 ` [patch 06/10] m68k: Enable arbitary speed tty support Geert Uytterhoeven
2007-08-12 9:40 ` [patch 07/10] m68k: Dont include RODATA into text segment Geert Uytterhoeven
2007-08-12 9:40 ` [patch 08/10] m68k: Fix a few hickups in drivers/scsi/Kconfig Geert Uytterhoeven
2007-08-12 9:40 ` [patch 09/10] zorro: Make sysfs `config attribute read-only Geert Uytterhoeven
2007-08-12 9:41 ` [patch 10/10] m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible Geert Uytterhoeven
2007-08-13 12:36 ` Michael Schmitz
2007-08-13 13:09 ` Finn Thain
2007-08-13 13:35 ` Michael Schmitz
2007-08-13 13:57 ` Geert Uytterhoeven
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=20070812094118.421833149@mail.of.borg \
--to=geert@linux-m68k.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=torvalds@linux-foundation.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).