[git pull] m68k updates for 2.6.34

[git pull] m68k updates for 2.6.34

[Geert Uytterhoeven]

	Hi Linus,

Please pull to receive the m68k updates for 2.6.34.

The parts that impact m68knommu have been acked by Greg.
The pmac_zilog parts have been acked by BenH.

Thanks!

The following changes since commit 06a79b82b2a3e4bebb9a20638ca208c780e9e507:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.org/.../rafael/suspend-2.6

are available in the git repository at:

  ssh://master.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git for-linus

Finn Thain (13):
      mac68k: cleanup
      mac68k: rework SWIM platform device
      pmac-zilog: cleanup
      pmac-zilog: add platform driver
      mac68k: replace mac68k SCC code with platform device
      mac68k: move mac_esp platform device
      mac68k: move macsonic and macmace platform devices
      fbdev: mac_var_to_mode() fix
      valkyriefb: various fixes
      mac68k: start CUDA early
      fbdev: add some missing mac modes
      macfb: cleanup
      macfb: fix 24-bit visual and stuff

Geert Uytterhoeven (2):
      ataflop: Killl warning about unused variable flags
      m68k: Eliminate unused variable in page_to_phys()

Julia Lawall (1):
      m68k: Use DIV_ROUND_CLOSEST

Maxim Kuvyrkov (5):
      m68k: Fix asm/swab.h for ColdFire
      m68k: Switch to generic siginfo layout
      m68k: Add NPTL support
      m68knommu: NPTL support for uClinux
      m68k: Define sigcontext ABI of ColdFire

Peter Huewe (1):
      m68k: vme_scc - __init annotations

Philippe De Muyter (2):
      m68k: Allow ioremapping top of memory
      m68k{,nommu}/h8300: Remove obsolete comment about map_chunk

 arch/h8300/mm/memory.c                 |    4 +-
 arch/m68k/Kconfig                      |    6 +-
 arch/m68k/amiga/config.c               |    2 +-
 arch/m68k/configs/mac_defconfig        |    7 +-
 arch/m68k/configs/multi_defconfig      |    6 +-
 arch/m68k/include/asm/machw.h          |   25 --
 arch/m68k/include/asm/macints.h        |   22 +-
 arch/m68k/include/asm/ptrace.h         |    2 +
 arch/m68k/include/asm/sigcontext.h     |    6 +
 arch/m68k/include/asm/siginfo.h        |   91 ----
 arch/m68k/include/asm/swab.h           |    2 +-
 arch/m68k/include/asm/thread_info_mm.h |    1 +
 arch/m68k/include/asm/thread_info_no.h |    1 +
 arch/m68k/include/asm/ucontext.h       |    4 +
 arch/m68k/include/asm/unistd.h         |    6 +-
 arch/m68k/include/asm/virtconvert.h    |    7 +-
 arch/m68k/kernel/entry.S               |    4 +
 arch/m68k/kernel/process.c             |    4 +
 arch/m68k/kernel/ptrace.c              |    5 +
 arch/m68k/kernel/signal.c              |    7 +
 arch/m68k/kernel/sys_m68k.c            |   81 ++++
 arch/m68k/mac/Makefile                 |    2 +-
 arch/m68k/mac/config.c                 |  344 ++++++++++------
 arch/m68k/mac/debug.c                  |  365 ----------------
 arch/m68k/mac/macints.c                |  101 +----
 arch/m68k/mac/oss.c                    |   20 +-
 arch/m68k/mac/via.c                    |    7 -
 arch/m68k/mm/kmap.c                    |    5 +-
 arch/m68knommu/kernel/process.c        |    4 +
 arch/m68knommu/kernel/ptrace.c         |    5 +
 arch/m68knommu/kernel/sys_m68k.c       |   36 ++
 arch/m68knommu/kernel/syscalltable.S   |    4 +
 arch/m68knommu/mm/memory.c             |    1 -
 drivers/block/ataflop.c                |    2 -
 drivers/block/swim.c                   |    4 +-
 drivers/char/vme_scc.c                 |   12 +-
 drivers/macintosh/adb.c                |    6 +-
 drivers/macintosh/via-cuda.c           |   74 ++--
 drivers/net/macmace.c                  |   33 +--
 drivers/net/macsonic.c                 |   33 +--
 drivers/scsi/mac_esp.c                 |   57 +---
 drivers/serial/Kconfig                 |   12 +-
 drivers/serial/pmac_zilog.c            |  240 ++++++++---
 drivers/serial/pmac_zilog.h            |   34 +-
 drivers/video/macfb.c                  |  736 +++++++++++++++-----------------
 drivers/video/macmodes.c               |   80 +++--
 drivers/video/valkyriefb.c             |    6 +-
 drivers/video/valkyriefb.h             |   31 +-
 48 files changed, 1111 insertions(+), 1436 deletions(-)
 delete mode 100644 arch/m68k/mac/debug.c

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

Re: [git pull] m68k updates for 2.6.34

[Maxim Kuvyrkov]

[-- Attachment #1: Type: text/plain, Size: 716 bytes --]

<CC trimmed>

On 2/28/10 12:13 AM, Geert Uytterhoeven wrote:
> 	Hi Linus,
>
> Please pull to receive the m68k updates for 2.6.34.
>
> The parts that impact m68knommu have been acked by Greg.
> The pmac_zilog parts have been acked by BenH.
>
> Thanks!
...
>        m68k: Define sigcontext ABI of ColdFire

I only now have noticed that an old version of this patch was merged in. 
  The latest version was posted here 
(http://marc.info/?l=linux-m68k&m=126571455916199&w=2) and included a 
fix for the libSegFault to not overflow sc_fpstate field [I got the math 
wrong the first time round].

The attached patch fixes this problem.

Thanks,

-- 
Maxim Kuvyrkov
CodeSourcery
maxim@codesourcery.com
(650) 331-3385 x724

[-- Attachment #2: 0001-Fix-struct-sigcontext-for-ColdFire.patch --]
[-- Type: text/plain, Size: 1162 bytes --]

>From de4c0f12fd2fd3e8436218dfb5edba3b3d570ee0 Mon Sep 17 00:00:00 2001
From: Maxim Kuvyrkov <maxim@codesourcery.com>
Date: Wed, 3 Mar 2010 16:53:45 +0300
Subject: [PATCH] Fix `struct sigcontext' for ColdFire

LibSegFault uses piggybacks sc_fpstate field of the `struct sigcontext'
and this patch avoids LibSegFault overflowing this field.  Also this
removes an unnecessary divergence from classic m68k.

Signed-off-by: Maxim Kuvyrkov <maxim@codesourcery.com>
---
 arch/m68k/include/asm/sigcontext.h |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/arch/m68k/include/asm/sigcontext.h b/arch/m68k/include/asm/sigcontext.h
index 1320eaa..a29dd74 100644
--- a/arch/m68k/include/asm/sigcontext.h
+++ b/arch/m68k/include/asm/sigcontext.h
@@ -17,13 +17,11 @@ struct sigcontext {
 #ifndef __uClinux__
 # ifdef __mcoldfire__
 	unsigned long  sc_fpregs[2][2];	/* room for two fp registers */
-	unsigned long  sc_fpcntl[3];
-	unsigned char  sc_fpstate[16+6*8];
 # else
 	unsigned long  sc_fpregs[2*3];  /* room for two fp registers */
+# endif
 	unsigned long  sc_fpcntl[3];
 	unsigned char  sc_fpstate[216];
-# endif
 #endif
 };
 
-- 
1.6.6.1

Re: [git pull] m68k updates for 2.6.34

[Geert Uytterhoeven]

On Wed, Mar 3, 2010 at 15:08, Maxim Kuvyrkov <maxim@codesourcery.com> wrote:
> On 2/28/10 12:13 AM, Geert Uytterhoeven wrote:
>> Please pull to receive the m68k updates for 2.6.34.

>>       m68k: Define sigcontext ABI of ColdFire
>
> I only now have noticed that an old version of this patch was merged in.

Oops, sorry about that.

>  The latest version was posted here
> (http://marc.info/?l=linux-m68k&m=126571455916199&w=2) and included a fix
> for the libSegFault to not overflow sc_fpstate field [I got the math wrong
> the first time round].
>
> The attached patch fixes this problem.

Thanks, applied. Queued for a later pull in the 2.6.34-rc timeline.

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

[git pull] m68k updates for 2.6.34

[Geert Uytterhoeven]

	Hi Linus,

Please pull to receive 2 more m68k updates for 2.6.34:
  - The first one fixes a build problem we started seeing lately,
  - The second one corrects struct sigcontext for ColdFire, as I've
    accidentally merged the wrong version of a patch for the previous
    pull request.

Thanks!

The following changes since commit b72c40949b0f04728f2993a1434598d3bad094ea:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.org/.../jbarnes/pci-2.6

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/geert/linux-m68k.git for-linus

Geert Uytterhoeven (1):
      m68k: Fix asm constraints for atomic_sub_and_test() and atomic_add_negative()

Maxim Kuvyrkov (1):
      m68k: Fix `struct sigcontext' for ColdFire

 arch/m68k/include/asm/atomic_mm.h  |    8 ++++++--
 arch/m68k/include/asm/sigcontext.h |    4 +---
 2 files changed, 7 insertions(+), 5 deletions(-)

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

Re: [git pull] m68k updates for 2.6.34

[Geert Uytterhoeven]

On Mon, Mar 29, 2010 at 20:52, Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> Please pull to receive 2 more m68k updates for 2.6.34:
>  - The first one fixes a build problem we started seeing lately,
>  - The second one corrects struct sigcontext for ColdFire, as I've
>    accidentally merged the wrong version of a patch for the previous
>    pull request.
>
> Thanks!

This one is still valid, I've just rebased to the latest version.
Thaks for pulling!

The following changes since commit 2ba3abd8186f24c7fb418927025b4e2120e3a362:
  Linus Torvalds (1):
        Merge branch 'pm-fixes' of git://git.kernel.org/.../rafael/suspend-2.6

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/geert/linux-m68k.git for-linus

Geert Uytterhoeven (1):
      m68k: Fix asm constraints for atomic_sub_and_test() and
atomic_add_negative()

Maxim Kuvyrkov (1):
      m68k: Fix `struct sigcontext' for ColdFire

 arch/m68k/include/asm/atomic_mm.h  |    8 ++++++--
 arch/m68k/include/asm/sigcontext.h |    4 +---
 2 files changed, 7 insertions(+), 5 deletions(-)

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