Kumar Gala
4d3248a29c
[PATCH] gianfar: Use new PHY_ID_FMT macro
...
Make the driver produce the string used by phy_connect and have board specific
code pass the integer mii bus id and phy device id for the specific controller
instance.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Jeff Garzik <jgarzik@pobox.com >
2006-01-12 16:31:52 -05:00
Kumar Gala
a4d00f179f
[PATCH] phy: Added a macro to represent the string format used to match a phy device
...
Add the PHY_ID_FMT macro to ensure that the format of the id string used by a
driver to match to its specific phy is consistent between the mdio_bus and the
driver.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Jeff Garzik <jgarzik@pobox.com >
2006-01-12 16:31:52 -05:00
Kumar Gala
1d5326774c
[PATCH] gianfar mii: Use proper resource for MII memory region
...
We can now have the gianfar mii platform device have a proper resource for the
IO memory region for its registers. Previously we passed this information
that the platform_data structure because we couldn't handle overlapping memory
regions for platform devices.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Jeff Garzik <jgarzik@pobox.com >
2006-01-12 16:31:51 -05:00
Linus Torvalds
bf785ee0ae
Merge master.kernel.org:/home/rmk/linux-2.6-arm
2006-01-12 12:23:49 -08:00
Jens Axboe
ba027def7b
[PATCH] Revert ide softirq handling
...
There's a problem with the REQ_BLOCK_PC handling as well (bad ->data_len
handling) where it could actually complete a request ahead of time. I
suggest we just back this out for now, I will resubmit it later when I'm
fully confident in it.
This reverts commit 8672d57138
Signed-off-by: Jens Axboe <axboe@suse.de >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 12:00:47 -08:00
Linus Torvalds
661dd5c840
Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/hrtimer-2.6
2006-01-12 10:22:11 -08:00
Linus Torvalds
45bfe98bd7
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
...
Fix up delete/modify conflict of arch/ppc/kernel/process.c by hand (it's
gone, gone, gone).
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 10:21:22 -08:00
Al Viro
639074354b
[PATCH] m68k: kill mach_floppy_setup, convert to proper __setup() in drivers
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Cc: Roman Zippel <zippel@linux-m68k.org >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:09:05 -08:00
Al Viro
35efbcabdc
[PATCH] m68k: cast in strnlen switched to unsigned long
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Cc: Roman Zippel <zippel@linux-m68k.org >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:09:04 -08:00
Al Viro
a5d361fc24
[PATCH] m68k: NULL noise removal
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Cc: Roman Zippel <zippel@linux-m68k.org >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:09:04 -08:00
Al Viro
d85f6891aa
[PATCH] m68k: dsp56k __user annotations
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Cc: Roman Zippel <zippel@linux-m68k.org >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:09:04 -08:00
Al Viro
6225d85f17
[PATCH] m68k: checksum __user annotations
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Cc: Roman Zippel <zippel@linux-m68k.org >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:09:03 -08:00
Al Viro
2382f77ffc
[PATCH] m68k: signal __user annotations
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Cc: Roman Zippel <zippel@linux-m68k.org >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:09:02 -08:00
Al Viro
11c40f8a6a
[PATCH] m68k: basic __user annotations
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Cc: Roman Zippel <zippel@linux-m68k.org >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:09:02 -08:00
Al Viro
ad9ec4f8de
[PATCH] m68k: basic iomem annotations
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Cc: Roman Zippel <zippel@linux-m68k.org >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:09:02 -08:00
Al Viro
0efb713482
[PATCH] m68k: bogus function argument types (sun3_pgtable.h)
...
function arguments can't be inline, TYVM...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Cc: Roman Zippel <zippel@linux-m68k.org >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:09:01 -08:00
Al Viro
84a65cc6c1
[PATCH] m68k: static vs. extern in amigaints.h
...
extern declaration of static object removed from header
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Cc: Roman Zippel <zippel@linux-m68k.org >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:09:01 -08:00
Al Viro
6ebf21ac7c
[PATCH] m68k: static vs. extern in sun3ints.h
...
extern declaration of static object removed from header
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Cc: Roman Zippel <zippel@linux-m68k.org >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:09:01 -08:00
Al Viro
b4290a23cf
[PATCH] m68k: namespace pollution fix (custom->amiga_custom)
...
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: Al Viro <viro@zeniv.linux.org.uk >
Cc: Roman Zippel <zippel@linux-m68k.org >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:09:00 -08:00
Al Viro
85b07cd1aa
[PATCH] m68k: compile fix - hardirq checks were in wrong place
...
move the sanity check for NR_IRQS being no more than 1<<HARDIRQ_BITS from
asm-m68k/hardirq.h to asm-m68k/irq.h; needed since NR_IRQS is not necessary
know at the points of inclusion of asm/hardirq.h due to the rather ugly header
dependencies on m68k. Fix is by far simpler than trying to massage those
dependencies...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Cc: Roman Zippel <zippel@linux-m68k.org >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:59 -08:00
Al Viro
f5a61d0c13
[PATCH] death of get_thread_info/put_thread_info
...
{get,put}_thread_info() were introduced in 2.5.4 and never
had been called by anything in the tree.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:59 -08:00
Al Viro
75bb07e788
[PATCH] mips: task_stack_page()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:59 -08:00
Al Viro
40bc9c671a
[PATCH] mips: task_pt_regs()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:58 -08:00
Al Viro
6450578f32
[PATCH] ia64: task_pt_regs()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:58 -08:00
Al Viro
ab03591db1
[PATCH] ia64: task_thread_info()
...
on ia64 thread_info is at the constant offset from task_struct and stack
is embedded into the same beast. Set __HAVE_THREAD_FUNCTIONS, made
task_thread_info() just add a constant.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:58 -08:00
Al Viro
cfa0f29b6d
[PATCH] cris: fix KSTK_EIP
...
cris KSTK_EIP looked for pt_regs at the right offset but from the wrong
place - forgotten ->thread_info
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:58 -08:00
Al Viro
95ca0dc603
[PATCH] cris: task_pt_regs()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:58 -08:00
Al Viro
7fdf0d7a20
[PATCH] arm26: task_stack_page()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:57 -08:00
Al Viro
02ef691f6c
[PATCH] arm26: task_pt_regs()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:57 -08:00
Al Viro
697102cda5
[PATCH] arm26: task_thread_info()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:57 -08:00
Al Viro
32d39a9355
[PATCH] arm: task_stack_page()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:56 -08:00
Al Viro
815d5ec86e
[PATCH] arm: task_pt_regs()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:55 -08:00
Al Viro
e7c1b32fd3
[PATCH] arm: task_thread_info()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:55 -08:00
Al Viro
6c3559fc45
[PATCH] m32r: task_pt_regs(), task_stack_page(), task_thread_info()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:54 -08:00
Al Viro
b7f6961d83
[PATCH] v850: task_stack_page(), task_pt_regs()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:54 -08:00
Al Viro
04fe6faf10
[PATCH] xtensa: task_pt_regs(), task_stack_page()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:54 -08:00
Al Viro
30af7120fe
[PATCH] s390: task_stack_page()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:54 -08:00
Al Viro
c7584fb6b4
[PATCH] s390: task_pt_regs()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:54 -08:00
Al Viro
d562ef6a23
[PATCH] sparc: task_thread_info()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:53 -08:00
Al Viro
308a792f7c
[PATCH] sh: task_stack_page()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:53 -08:00
Al Viro
3cf0f4ece9
[PATCH] sh: task_pt_regs()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:52 -08:00
Al Viro
26ecbdea4b
[PATCH] sparc64: task_pt_regs()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:52 -08:00
Al Viro
f3169641c1
[PATCH] sparc64: task_thread_info()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:52 -08:00
Al Viro
65e0fdffc9
[PATCH] i386: task_stack_page()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:52 -08:00
akpm@osdl.org
07b047fc24
[PATCH] i386: fix task_pt_regs()
...
)
From: Al Viro <viro@ftp.linux.org.uk >
task_pt_regs() needs the same offset-by-8 to match copy_thread()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:52 -08:00
Al Viro
06b425d80f
[PATCH] i386: task_thread_info()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:51 -08:00
Al Viro
bb049232fa
[PATCH] amd64: task_pt_regs()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:51 -08:00
Al Viro
e4f17c436f
[PATCH] amd64: task_thread_info()
...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:51 -08:00
akpm@osdl.org
e52f4ca2a7
[PATCH] alpha: task_pt_regs()
...
)
From: Al Viro <viro@ftp.linux.org.uk >
rename alpha_task_regs() to task_pt_regs(), switch open-coded instances
to use of the helper.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:50 -08:00
Al Viro
27f451304a
[PATCH] alpha: task_stack_page()
...
use task_stack_page() for accesses to stack page of task in alpha-specific
parts of tree
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-01-12 09:08:50 -08:00