Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

into pobox.com:/garz/repo/netdev-2.6/misc

Mark deadline_init and deadline_exit as init and exit functions, and
make them static.
Signed-off-by: Chris Wright <chris@osdl.org>
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Mark cfq_exit function as and exit function, and make it static.
Signed-off-by: Chris Wright <chris@osdl.org>
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Mark as_init and as_exit as init and exit functions, and make them static.
Signed-off-by: Chris Wright <chris@osdl.org>
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This box crashed at startup today and I noticed that some modules will
need to have assign_irq_vector() available although it is marked as
__init.

Looks like it was done for i386 in but not x86_64...
Signed-off-by: Alexander Nyberg <alexn@dsv.su.se>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Spot the typo.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch is from the Xen crew - it allows override of deciding whether
two given pages can be considered physically contigous or not. This is
similar to how we handle iommu and virtual merging.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Correct wrong paths and add link to deadline documentation.

Patch from Christian Kujau <evil@g-house.de>
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Warn once for each unknown command sent through SG_IO or the old SCSI
command ioctl.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Current BK doesn't compile with the G5 defconfig because the last
libata updated missed to change sata_svw to the new conventions.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

Correct MODULE_PARM to module_param (somehow I changed the
macro parameters but not the macro invocation).
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Randy Dunlap <torvalds@osdl.org>

Stuff marked initdata that is referenced in non-init context.

Referenced in non-init context.

The below removes an __initdata
(for initarray_generic that is referenced in non-init code).

The i386 timers use a struct timer_opts that has a field init
pointing at a __init function. The rest of the struct is not __init.

Nothing is wrong, but if we want to avoid having references to init stuff
in non-init sections, some reshuffling is needed.

The below replaces

struct timer_opts {
	int (*init)(char *override);
	... more ...
};

by the two structs

struct timer_opts {
	... more ...
};

struct init_time_opts {
	int (*init)(char *override);
	struct timer_opts *opts;
};

where the second is __initdata.

Routines referred to from __devinitdata.

In do_mounts_rd.c and initramfs.c there are many references
from .text to .text.init because of the inclusion of lib/inflate.c.
The below adds INIT markup in lib/inflate.c.

It is forbidden to refer from __devinit to __init.  (Unless one argues
that in the given situation hotplugging is actually impossible.  Too
ugly.)

However, es1371_probe() is __devinit and referred to __initdata initvol[]
and to __init src_init().

Many people are being bitten by the fact that if they select
CONFIG_PARTITION_ADVANCED in order to get some additional support,
they suddenly lose support for the MSDOS_PARTITION type.

Moreover, everybody needs MSDOS_PARTITION - also people not on i386,
since it is the type used on smart media and compact flash and
similar cards.

So, the below advises people "Say Y here" for MSDOS_PARTITION,
and does not change the default choices when PARTITION_ADVANCED
is selected.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Fix up cpufreq Makefile merge manually

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Patch from Ben Dooks

Add PORT_S3C2440 to include/linux/serial_core.h

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Alan Cox, expanded to cover ARM drivers by Russell King.

- define SUPPORT_SYSRQ early
- ensure consistent include ordering
- use proper helper functions for flip buffer handling
- remove deadlock on overrun

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Patch from Ben Dooks

Add machine entry and support for the HP iPAQ rx3715
into arch/arm/mach-s3c2410, as well as updating the
default configuration for the s3c2410 to include it.

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Remove s3c2410_pm_init() if CONFIG_PM is not set.

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux