From: Greg Ungerer <gerg@snapgear.com>
To: David Howells <dhowells@redhat.com>
Cc: <paul.gortmaker@windriver.com>, <hpa@zytor.com>,
<torvalds@linux-foundation.org>, <linux-kernel@vger.kernel.org>,
<linux-arch@vger.kernel.org>, <arnd@arndb.de>,
<linux-m68k@vger.kernel.org>
Subject: Re: [PATCH 13/35] Disintegrate asm/system.h for M68K [ver #2]
Date: Wed, 14 Mar 2012 22:07:49 +1000 [thread overview]
Message-ID: <4F608A15.9030609@snapgear.com> (raw)
In-Reply-To: <20120312233816.13888.142.stgit@warthog.procyon.org.uk>
Hi David,
On 03/13/2012 09:38 AM, David Howells wrote:
> Disintegrate asm/system.h for M68K.
>
> Signed-off-by: David Howells<dhowells@redhat.com>
> cc: linux-m68k@lists.linux-m68k.org
> ---
>
> arch/m68k/amiga/amisound.c | 1
> arch/m68k/amiga/config.c | 1
> arch/m68k/apollo/config.c | 1
> arch/m68k/atari/ataints.c | 1
> arch/m68k/atari/atasound.c | 1
> arch/m68k/atari/config.c | 1
> arch/m68k/bvme6000/config.c | 1
> arch/m68k/bvme6000/rtc.c | 1
> arch/m68k/hp300/time.c | 1
> arch/m68k/include/asm/atomic.h | 2
> arch/m68k/include/asm/barrier.h | 20 ++++
> arch/m68k/include/asm/cmpxchg.h | 129 +++++++++++++++++++++++
> arch/m68k/include/asm/exec.h | 6 +
> arch/m68k/include/asm/sun3xflop.h | 1
> arch/m68k/include/asm/switch_to.h | 41 +++++++
> arch/m68k/include/asm/system.h | 198 +----------------------------------
> arch/m68k/kernel/ints.c | 1
> arch/m68k/kernel/irq.c | 1
> arch/m68k/kernel/process_mm.c | 1
> arch/m68k/kernel/process_no.c | 1
> arch/m68k/kernel/ptrace_mm.c | 1
> arch/m68k/kernel/ptrace_no.c | 1
> arch/m68k/kernel/traps.c | 1
> arch/m68k/kernel/vectors.c | 1
> arch/m68k/mac/config.c | 1
> arch/m68k/mac/misc.c | 1
> arch/m68k/mm/fault.c | 1
> arch/m68k/mm/init_mm.c | 1
> arch/m68k/mm/init_no.c | 1
> arch/m68k/mm/kmap.c | 1
> arch/m68k/mm/memory.c | 1
> arch/m68k/mm/motorola.c | 1
> arch/m68k/mm/sun3mmu.c | 1
> arch/m68k/mvme147/config.c | 1
> arch/m68k/mvme16x/config.c | 1
> arch/m68k/mvme16x/rtc.c | 1
> arch/m68k/platform/68328/config.c | 1
> arch/m68k/platform/68328/timers.c | 1
> arch/m68k/platform/68360/config.c | 1
> arch/m68k/platform/68EZ328/config.c | 1
> arch/m68k/platform/68VZ328/config.c | 1
> arch/m68k/q40/config.c | 1
> arch/m68k/q40/q40ints.c | 1
> arch/m68k/sun3/intersil.c | 1
> arch/m68k/sun3/mmu_emu.c | 1
> arch/m68k/sun3/prom/console.c | 1
> arch/m68k/sun3x/config.c | 1
> arch/m68k/sun3x/time.c | 1
> 48 files changed, 202 insertions(+), 236 deletions(-)
> create mode 100644 arch/m68k/include/asm/barrier.h
> create mode 100644 arch/m68k/include/asm/cmpxchg.h
> create mode 100644 arch/m68k/include/asm/exec.h
> create mode 100644 arch/m68k/include/asm/switch_to.h
>
[snip]
>
> diff --git a/arch/m68k/include/asm/cmpxchg.h b/arch/m68k/include/asm/cmpxchg.h
> new file mode 100644
> index 0000000..f8acc0f
> --- /dev/null
> +++ b/arch/m68k/include/asm/cmpxchg.h
> @@ -0,0 +1,129 @@
> +#ifndef __ARCH_M68K_CMPXCHG__
> +#define __ARCH_M68K_CMPXCHG__
> +
> +#include<linux/irqflags.h>
> +
> +struct __xchg_dummy { unsigned long a[100]; };
> +#define __xg(x) ((volatile struct __xchg_dummy *)(x))
> +
> +#ifndef CONFIG_RMW_INSNS
> +static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
> +{
> + unsigned long flags, tmp;
> +
> + local_irq_save(flags);
> +
> + switch (size) {
> + case 1:
> + tmp = *(u8 *)ptr;
> + *(u8 *)ptr = x;
> + x = tmp;
> + break;
> + case 2:
> + tmp = *(u16 *)ptr;
> + *(u16 *)ptr = x;
> + x = tmp;
> + break;
> + case 4:
> + tmp = *(u32 *)ptr;
> + *(u32 *)ptr = x;
> + x = tmp;
> + break;
> + default:
> + BUG();
This breaks compilation for m68k targets with:
CC net/ipv4/ip_input.o
In file included from
/home/gerg/new-wave.320/linux-3.x/arch/m68k/include/asm/system.h:3:0,
from net/ipv4/ip_input.c:116:
/home/gerg/new-wave.320/linux-3.x/arch/m68k/include/asm/cmpxchg.h: In
function ‘__xchg’:
/home/gerg/new-wave.320/linux-3.x/arch/m68k/include/asm/cmpxchg.h:33:3:
error: implicit declaration of function ‘BUG’
The old system.h included linux/kernel.h which includes asm/bug.h.
Just including asm/bug.h here in cmpxchg.h is not enough to fix it.
If you include linux/kernel.h though it compiles cleanly.
Regards
Greg
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close, FAX: +61 7 3891 3630
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
next prev parent reply other threads:[~2012-03-14 12:09 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-12 23:36 [RFC][PATCH 00/35] Disintegrate and kill asm/system.h [ver #2] David Howells
2012-03-12 23:36 ` [PATCH 01/35] Disintegrate asm/system.h for X86 " David Howells
2012-03-12 23:36 ` [PATCH 02/35] Disintegrate asm/system.h for Alpha " David Howells
2012-03-12 23:36 ` [PATCH 03/35] Disintegrate asm/system.h for ARM " David Howells
2012-03-12 23:36 ` [PATCH 04/35] Disintegrate asm/system.h for AVR32 " David Howells
2012-03-12 23:36 ` [PATCH 05/35] Disintegrate asm/system.h for Blackfin " David Howells
2012-03-13 4:44 ` Bob Liu
2012-03-12 23:37 ` [PATCH 06/35] Disintegrate asm/system.h for C6X " David Howells
2012-03-14 12:29 ` Mark Salter
2012-03-14 13:29 ` [Linux-c6x-dev] " Jacquiot, Aurelien
2012-03-14 13:39 ` Mark Salter
2012-03-15 17:41 ` David Howells
2012-03-15 17:41 ` David Howells
2012-03-12 23:37 ` [PATCH 07/35] Disintegrate asm/system.h for CRIS " David Howells
2012-03-13 9:16 ` Jesper Nilsson
2012-03-12 23:37 ` [PATCH 08/35] Disintegrate asm/system.h for FRV " David Howells
2012-03-12 23:37 ` [PATCH 09/35] Disintegrate asm/system.h for H8300 " David Howells
2012-03-12 23:37 ` [PATCH 10/35] Disintegrate asm/system.h for Hexagon " David Howells
2012-03-13 9:16 ` Arnd Bergmann
2012-03-13 10:01 ` David Howells
2012-03-13 11:33 ` Arnd Bergmann
2012-03-13 16:31 ` Richard Kuo
2012-03-13 18:34 ` Richard Kuo
2012-03-12 23:37 ` [PATCH 11/35] Disintegrate asm/system.h for IA64 " David Howells
2012-03-12 23:38 ` [PATCH 12/35] Disintegrate asm/system.h for M32R " David Howells
2012-03-12 23:38 ` [PATCH 13/35] Disintegrate asm/system.h for M68K " David Howells
2012-03-14 12:07 ` Greg Ungerer [this message]
2012-03-15 20:18 ` David Howells
2012-03-16 1:05 ` Greg Ungerer
2012-03-16 13:42 ` David Howells
2012-03-19 2:24 ` Greg Ungerer
2012-03-19 10:49 ` David Howells
2012-03-19 11:48 ` Greg Ungerer
2012-03-12 23:38 ` [PATCH 14/35] Disintegrate asm/system.h for Microblaze " David Howells
2012-03-12 23:38 ` [PATCH 15/35] Disintegrate asm/system.h for MIPS " David Howells
2012-03-12 23:38 ` [PATCH 16/35] Disintegrate asm/system.h for MN10300 " David Howells
2012-03-12 23:38 ` [PATCH 17/35] Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h " David Howells
2012-03-13 9:00 ` Arnd Bergmann
2012-03-13 17:26 ` [ORLinux] " Jonas Bonn
2012-03-14 11:10 ` David Howells
2012-03-14 14:43 ` Jonas Bonn
2012-03-14 15:17 ` David Howells
2012-03-14 15:23 ` Jonas Bonn
2012-03-14 17:07 ` David Howells
2012-03-14 17:36 ` Jonas Bonn
2012-03-19 10:51 ` David Howells
2012-03-19 11:33 ` Jonas Bonn
2012-03-19 12:05 ` David Howells
2012-03-12 23:39 ` [PATCH 18/35] Create asm-generic/barrier.h " David Howells
2012-03-13 9:10 ` Arnd Bergmann
2012-03-12 23:39 ` [PATCH 19/35] Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h " David Howells
2012-03-13 9:11 ` Arnd Bergmann
2012-03-12 23:39 ` [PATCH 20/35] Split the switch_to() wrapper out of asm-generic/system.h " David Howells
2012-03-13 9:11 ` Arnd Bergmann
2012-03-12 23:39 ` [PATCH 21/35] Split arch_align_stack() out from " David Howells
2012-03-13 9:11 ` Arnd Bergmann
2012-03-12 23:39 ` [PATCH 22/35] Disintegrate asm/system.h for OpenRISC " David Howells
2012-03-13 9:12 ` Arnd Bergmann
2012-03-12 23:39 ` [PATCH 23/35] Disintegrate asm/system.h for PA-RISC " David Howells
2012-03-12 23:40 ` [PATCH 24/35] Disintegrate asm/system.h for PowerPC " David Howells
2012-03-12 23:40 ` [PATCH 25/35] Disintegrate asm/system.h for S390 " David Howells
2012-03-12 23:40 ` [PATCH 26/35] Disintegrate asm/system.h for Score " David Howells
2012-03-12 23:40 ` [PATCH 27/35] Disintegrate asm/system.h for SH " David Howells
2012-03-12 23:40 ` [PATCH 28/35] Disintegrate asm/system.h for Sparc " David Howells
2012-03-12 23:40 ` [PATCH 29/35] Disintegrate asm/system.h for Tile " David Howells
2012-03-13 17:59 ` Chris Metcalf
2012-03-12 23:41 ` [PATCH 30/35] Disintegrate asm/system.h for Unicore32 " David Howells
2012-03-12 23:41 ` [PATCH 31/35] Disintegrate asm/system.h for Xtensa " David Howells
2012-03-12 23:41 ` [PATCH 32/35] Move all declarations of free_initmem() to linux/mm.h " David Howells
2012-03-12 23:41 ` [PATCH 33/35] Disintegrate asm/system.h on all arches " David Howells
2012-03-12 23:41 ` [PATCH 34/35] Remove all #inclusions of asm/system.h " David Howells
2012-03-14 12:35 ` Mark Salter
2012-03-12 23:42 ` [PATCH 35/35] Delete all instances " David Howells
2012-03-13 14:11 ` [RFC][PATCH 00/35] Disintegrate and kill " David Howells
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=4F608A15.9030609@snapgear.com \
--to=gerg@snapgear.com \
--cc=arnd@arndb.de \
--cc=dhowells@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--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