提交 · 45bfe98bd790b5ded00462cd582effcfb42263cc · openeuler / raspberrypi-kernel

13 1月, 2006 40 次提交

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge · 45bfe98b

由 Linus Torvalds 提交于 1月 12, 2006

Fix up delete/modify conflict of arch/ppc/kernel/process.c by hand (it's
gone, gone, gone).
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

45bfe98b

L

Merge git://oss.sgi.com:8090/oss/git/xfs-2.6 · 9f5974c8
由 Linus Torvalds 提交于 1月 12, 2006

9f5974c8

[PATCH] m68k: console code in head.S needs framebuffer support built in · a2d823bf

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

a2d823bf

[PATCH] m68k: fix PIO case in esp · 3c9757b7

由 Al Viro 提交于 1月 12, 2006

we always set ->SCp.ptr to physical address of buffer; for DMA that's
just what we need, but we end up using it as virtual address in PIO
case of esp_do_data(), with obvious breakage as soon as memory mapping
becomes non-trivial.  The fix is obvious.
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

3c9757b7

[PATCH] m68k: fix macfb init · ed1705af

由 Al Viro 提交于 1月 12, 2006

To be used by module_init() function should return int; same for functions
that have "return -ENODEV;" in them, actually ;-)
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

ed1705af

[PATCH] m68k: fix reference to init_task in vmlinux-sun3.lds · 54a5a6eb

由 Al Viro 提交于 1月 12, 2006

it's *(.data.init_task), not init_task...
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

54a5a6eb

[PATCH] m68k: fix use of void foo(void) asm("bar") in traps.c · a763be5c

由 Al Viro 提交于 1月 12, 2006

with gcc4 these have file scope, so having them different in different
blocks doesn't work anymore
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

a763be5c

[PATCH] m68k: kill mach_floppy_setup, convert to proper __setup() in drivers · 63907435

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

63907435

[PATCH] m68k: Moved initialisation of conswitchp from subarches to global arch setup · 0c79358b

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NKars de Jong <jongk@linux-m68k.org>
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

0c79358b

[PATCH] m68k: cast in strnlen switched to unsigned long · 35efbcab

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

35efbcab

[PATCH] m68k: NULL noise removal · a5d361fc

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

a5d361fc

[PATCH] m68k: dmasound __user annotations · 031eb4cd

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

031eb4cd

[PATCH] m68k: zorro __user annotations · d998265f

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

d998265f

[PATCH] m68k: amifb __user annotations · 3728d254

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

3728d254

[PATCH] m68k: dsp56k __user annotations · d85f6891

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

d85f6891

[PATCH] m68k: amiserial __user annotations · ab14caec

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

ab14caec

[PATCH] m68k: ataflop __user annotations, NULL noise removal · 2c7af511

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

2c7af511

[PATCH] m68k: amiflop __user annotations · 8a423e54

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

8a423e54

[PATCH] m68k: checksum __user annotations · 6225d85f

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

6225d85f

[PATCH] m68k: syscalls __user annotation · 350c20a6

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

350c20a6

[PATCH] m68k: rtc __user annotations · 1b7bb54a

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

1b7bb54a

[PATCH] m68k: signal __user annotations · 2382f77f

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

2382f77f

[PATCH] m68k: basic __user annotations · 11c40f8a

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

11c40f8a

[PATCH] m68k: basic iomem annotations · ad9ec4f8

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

ad9ec4f8

[PATCH] m68k: compile fixes for dmasound (static vs. extern) · 9a472911

由 Al Viro 提交于 1月 12, 2006

sound/oss/dmasound/dmasound_atari.c has static expand_bal
sound/oss/dmasound/dmasound_q40.c has static expand_bal
sound/oss/dmasound/dmasound_awacs.c has non-static expand_bal
sound/oss/dmasound/trans_16.c uses expand_bal from dmasound_awacs.c
all 4 include dmasound.h; extern for expand_bal used to be there,
which is a bloody bad idea, considering _atari and _q40.  Moved the
extern to trans_16.c.
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

9a472911

[PATCH] m68k: lvalues abuse in dmasound · 3756513d

由 Al Viro 提交于 1月 12, 2006

Cast is not an lvalue
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

3756513d

[PATCH] m68k: dmasound_paula.c lvalues abuse (from m68k CVS) · 815f597b

由 Al Viro 提交于 1月 12, 2006

Avoid warnings about use of cast expressions as lvalues
Signed-off-by: NRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

815f597b

[PATCH] m68k: lvalues abuse in mac8390 · 09cc07a5

由 Al Viro 提交于 1月 12, 2006

Cast is not an lvalue
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

09cc07a5

[PATCH] m68k: bogus function argument types (sun3_pgtable.h) · 0efb7134

由 Al Viro 提交于 1月 12, 2006

function arguments can't be inline, TYVM...
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

0efb7134

[PATCH] m68k: broken constraints on mulu.l · 7f263338

由 Al Viro 提交于 1月 12, 2006

Too permissive constraint on mulu.l - the first argument should not be
an a-register.  Fixed by replacing "g" with "dm"; with older gcc we got
lucky and it had never attempted mulu.l %a0, %d1:%d0.  These days it
does, with predictable objections from as(1).
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

7f263338

[PATCH] m68k: memory input should be an lvalue (mac/misc.c) · 77add9f3

由 Al Viro 提交于 1月 12, 2006

gcc4 is less forgiving and wants memory inputs to be real lvalues; variable
added and value stored in it explicitly before doing __asm__.
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

77add9f3

[PATCH] m68k: static vs. extern in amigaints.h · 84a65cc6

由 Al Viro 提交于 1月 12, 2006

extern declaration of static object removed from header
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

84a65cc6

[PATCH] m68k: static vs. extern in sun3ints.h · 6ebf21ac

由 Al Viro 提交于 1月 12, 2006

extern declaration of static object removed from header
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

6ebf21ac

[PATCH] m68k: static vs. extern in scc.h · df87ac96

由 Al Viro 提交于 1月 12, 2006

extern declaration before the static one
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

df87ac96

[PATCH] m68k: isa_{type,sex} should be exported · aa7e02fe

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

aa7e02fe

[PATCH] m68k: oktagon makefile fix · 64194061

由 Al Viro 提交于 1月 12, 2006

oktagon_esp is described as modular.  However, drivers/scsi/Makefile doesn't
handle it right - it's multi-object module, with one of the parts being built
from .S.  Current makefile tries to declare each part a module of its own;
that not only wouldn't work (oktagon_io.o doesn't have the right parts for
that), it actually doesn't even build since kbuild doesn't believe in
single-object modules built from .S.  Turned into proper multi-object
module...
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

64194061

[PATCH] m68k: dumb typo in atyfb · cef46b1f

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

cef46b1f

[PATCH] m68k: switch mac/misc.c to direct use of appropriate cuda/pmu/maciisi requests · 3272244c

由 Al Viro 提交于 1月 12, 2006

kill ADBREQ_RAW use, replace adb_read_time(), etc.  with per-type variants,
eliminated remapping from pmu ones, fix the ifdefs (PMU->PMU68K)
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

3272244c

[PATCH] m68k: namespace pollution fix (custom->amiga_custom) · b4290a23

由 Al Viro 提交于 1月 12, 2006

in amigahw.h custom renamed to amiga_custom, in drivers with few instances the
same replacement, in the rest - #define custom amiga_custom in driver itself
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

b4290a23

[PATCH] m68k: compile fix - updated vmlinux.lds to include LOCK_TEXT · 198a4101

由 Al Viro 提交于 1月 12, 2006

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

198a4101