M68k tree updates

M68k tree updates

[Geert Uytterhoeven]

It took me a while, but finally I managed to update
http://git.kernel.org/?p=linux/kernel/git/geert/linux-m68k.git again.

I added the following to master (the main development branch):

Andreas Schwab (2):
      m68k: use generic code for ptrace requests
      m68k: ptrace fixes

Geert Uytterhoeven (5):
      rtc: Add an RTC driver for the Oki MSM6242
      rtc: Add an RTC driver for the Ricoh RP5C01
      kgdb: Replace strstr() by strchr() for single-character needles
      net: ETHOC should depend on HAS_DMA
      dvb: SMS_SIANO_MDTV should depend on HAS_DMA

John Kacur (1):
      m68k: Remove the BKL from sys_execve

Krzysztof Helt (1):
      fbdev: atafb - add palette register check

Roel Kluin (1):
      m68k: parport_mfc3 - Not makes it a bool before the comparison.

Stephen Rothwell (1):
      m68k: don't export static inline functions

Tim Abbott (2):
      m68k: Make thread_info.h usable from assembly.
      m68k: Cleanup linker scripts using new linker script macros.


I added the following to for-next (aka for-2.6.33, to submit when the merge
window for 2.6.33 opens):

Andreas Schwab (2):
      m68k: use generic code for ptrace requests
      m68k: ptrace fixes

Geert Uytterhoeven (2):
      rtc: Add an RTC driver for the Oki MSM6242
      rtc: Add an RTC driver for the Ricoh RP5C01

John Kacur (1):
      m68k: Remove the BKL from sys_execve

Krzysztof Helt (1):
      fbdev: atafb - add palette register check

Roel Kluin (1):
      m68k: parport_mfc3 - Not makes it a bool before the comparison.

Stephen Rothwell (1):
      m68k: don't export static inline functions

Tim Abbott (2):
      m68k: Make thread_info.h usable from assembly.
      m68k: Cleanup linker scripts using new linker script macros.


I haven't updated m68k-queue (the branch with clean m68k changes w.r.t.
Linus' tree) yet.

If anything is missing, please tell me. Thx!

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: M68k tree updates

[Maxim Kuvyrkov]

Geert Uytterhoeven wrote:
> It took me a while, but finally I managed to update
> http://git.kernel.org/?p=linux/kernel/git/geert/linux-m68k.git again.
...
> If anything is missing, please tell me. Thx!

How about the NPTL patch (0001-Add-NPTL-support-for-m68k.patch,
http://marc.info/?l=linux-m68k&m=125447760017098&w=2)?

Also, this trivial fix (0004-Fix-m68k-s-asm-swab.h-for-ColdFire.patch, 
http://marc.info/?l=linux-m68k&m=125447494213740&w=2) can go in.

Thanks!

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

Re: M68k tree updates

[Geert Uytterhoeven]

On Mon, Nov 30, 2009 at 14:43, Maxim Kuvyrkov <maxim@codesourcery.com> wrote:
> Geert Uytterhoeven wrote:
>>
>> It took me a while, but finally I managed to update
>> http://git.kernel.org/?p=linux/kernel/git/geert/linux-m68k.git again.
>
> ...
>>
>> If anything is missing, please tell me. Thx!
>
> How about the NPTL patch (0001-Add-NPTL-support-for-m68k.patch,
> http://marc.info/?l=linux-m68k&m=125447760017098&w=2)?

As you're adding syscalls (which are shared with m68knommu), I'll have
to ask whether
you will make it work on nommu, too?

Furthermore, when building for Sun3:

arch/m68k/kernel/sys_m68k.c:706: warning: passing argument 1 of
'kunmap' from incompatible pointer type
arch/m68k/kernel/sys_m68k.c:714: warning: passing argument 1 of
'kunmap' from incompatible pointer type

Which looks like a problem with the Sun 3 version of pte_unmap().

I'm gonna add it to the m68k tree though, unless someone complains.

> Also, this trivial fix (0004-Fix-m68k-s-asm-swab.h-for-ColdFire.patch,
> http://marc.info/?l=linux-m68k&m=125447494213740&w=2) can go in.

I want to run this one by the nommu people as well...

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: M68k tree updates

[Maxim Kuvyrkov]

Geert Uytterhoeven wrote:
> On Mon, Nov 30, 2009 at 14:43, Maxim Kuvyrkov <maxim@codesourcery.com> wrote:
>> Geert Uytterhoeven wrote:
>>> It took me a while, but finally I managed to update
>>> http://git.kernel.org/?p=linux/kernel/git/geert/linux-m68k.git again.
>> ...
>>> If anything is missing, please tell me. Thx!
>> How about the NPTL patch (0001-Add-NPTL-support-for-m68k.patch,
>> http://marc.info/?l=linux-m68k&m=125447760017098&w=2)?
> 
> As you're adding syscalls (which are shared with m68knommu), I'll have
> to ask whether
> you will make it work on nommu, too?

Yes, that's quite straight-forward so I'll try to post the patch tomorrow.

> 
> Furthermore, when building for Sun3:
> 
> arch/m68k/kernel/sys_m68k.c:706: warning: passing argument 1 of
> 'kunmap' from incompatible pointer type
> arch/m68k/kernel/sys_m68k.c:714: warning: passing argument 1 of
> 'kunmap' from incompatible pointer type
> 
> Which looks like a problem with the Sun 3 version of pte_unmap().

Right.  Sun3's implementation assumes that one can cast between (pte_t 
*) and pgtable_t interchangeably; fwiw, I don't know if this is the case.

> 
> I'm gonna add it to the m68k tree though, unless someone complains.

Thanks!

> 
>> Also, this trivial fix (0004-Fix-m68k-s-asm-swab.h-for-ColdFire.patch,
>> http://marc.info/?l=linux-m68k&m=125447494213740&w=2) can go in.
> 
> I want to run this one by the nommu people as well...

To illustrate the problem more clearly, here is the code that the patch 
fixes:

#if defined (__mcfisaaplus__) || defined (__mcfisac__)
static inline __attribute_const__ __u32 __arch_swab32(__u32 val)
{
	__asm__("byterev %0" : "=d" (val) : "0" (val));
	return val;
}

#define __arch_swab32 __arch_swab32
#elif !defined(__uClinux__)

static inline __attribute_const__ __u32 __arch_swab32(__u32 val)
{
	__asm__("rolw #8,%0; swap %0; rolw #8,%0" : "=d" (val) : "0" (val));
	return val;
}
#define __arch_swab32 __arch_swab32
#endif

As far as I know, all non-ColdFire CPUs support rolw instruction, so 
enabling it for uClinux should not be a problem.  Regarding the ColdFire 
  CPUs, none of the CF ISAs include rolw, so the patch fixes the case of 
building the kernel for MMU Linux ISA_B CPU, e.g., mcf547x/8x family.

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

Re: M68k tree updates

[Greg Ungerer]

Geert Uytterhoeven wrote:
> On Mon, Nov 30, 2009 at 14:43, Maxim Kuvyrkov <maxim@codesourcery.com> wrote:
>> Geert Uytterhoeven wrote:
>>> It took me a while, but finally I managed to update
>>> http://git.kernel.org/?p=linux/kernel/git/geert/linux-m68k.git again.
>> ...
>>> If anything is missing, please tell me. Thx!
>> How about the NPTL patch (0001-Add-NPTL-support-for-m68k.patch,
>> http://marc.info/?l=linux-m68k&m=125447760017098&w=2)?
> 
> As you're adding syscalls (which are shared with m68knommu), I'll have
> to ask whether
> you will make it work on nommu, too?
> 
> Furthermore, when building for Sun3:
> 
> arch/m68k/kernel/sys_m68k.c:706: warning: passing argument 1 of
> 'kunmap' from incompatible pointer type
> arch/m68k/kernel/sys_m68k.c:714: warning: passing argument 1 of
> 'kunmap' from incompatible pointer type
> 
> Which looks like a problem with the Sun 3 version of pte_unmap().
> 
> I'm gonna add it to the m68k tree though, unless someone complains.
> 
>> Also, this trivial fix (0004-Fix-m68k-s-asm-swab.h-for-ColdFire.patch,
>> http://marc.info/?l=linux-m68k&m=125447494213740&w=2) can go in.
> 
> I want to run this one by the nommu people as well...

That patch looks good to me.

Acked-by: Greg Ungerer <gerg@uclinux.org>

Regards
Greg


------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg@snapgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close                             FAX:         +61 7 3217 5323
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com

Re: M68k tree updates

[Maxim Kuvyrkov]

Geert Uytterhoeven wrote:
> It took me a while, but finally I managed to update
> http://git.kernel.org/?p=linux/kernel/git/geert/linux-m68k.git again.
> 
> I added the following to master (the main development branch):
...
> I haven't updated m68k-queue (the branch with clean m68k changes w.r.t.
> Linus' tree) yet.
> 
> If anything is missing, please tell me. Thx!

I almost forgot about these two patches:

0001-Define-sigcontext-ABI-of-ColdFire.patch
0002-Fix-m68k-uclinux-s-rt_sigreturn-trampoline.patch

The first patch makes `struct sigcontext' compatible with ColdFire and 
fixes the rt_sigreturn trampoline for ColdFire.  The second patch fixes 
a typo in m68knommu code for rt_sigreturn trampoline.

Both patches are attached to this message 
http://marc.info/?l=linux-m68k&m=125365546306821&w=2 .

I'll appreciate merging these patches to master if it's not too late.

Thanks,

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