Steven Whitehouse
66de045d9f
[GFS2] Make our address_space_operations const
...
As per Christoph's patch:
http://www.kernel.org/git/?p=linux/kernel/git/steve/gfs2-2.6.git;a=commitdiff;h=f5e54d6e53a20cef45af7499e86164f0e0d16bb2
We mark struct address_space_operations const in GFS2.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com >
2006-07-03 13:37:30 -04:00
Steven Whitehouse
0c0834a30c
[GFS2] API change for gfs2_statfs
...
The kernel API for super_operations->statfs() has changed
so this updates GFS2 to the new API.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com >
2006-07-03 11:38:01 -04:00
Andrew Morton
ccd6efd0cd
[patch 1/1] gfs2: get_sb_dev() fix
...
Update GFS2 for dhowells API changes.
Cc: Steven Whitehouse <swhiteho@redhat.com >
Cc: David Howells <dhowells@redhat.com >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com >
2006-07-03 11:23:09 -04:00
Steven Whitehouse
02630a12c7
[GFS2] Remove dependance on tty_write_message()
...
This removes the call in GFS2 to tty_write_message and replaces
it with a printk. As the export was added by GFS2, we remove this
as well.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com >
2006-07-03 11:20:06 -04:00
Steven Whitehouse
0a1340c185
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
...
Conflicts:
include/linux/kernel.h
2006-07-03 10:25:08 -04:00
Thomas Gleixner
29454dde27
[PATCH] genirq: Fixup ARM devel merge
...
ARM devel merge introduced new machine functionality which was not
covered by the ARM -> genirq patches. Fix it up and make it compile
again.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-07-02 17:29:57 -07:00
Thomas Gleixner
bb8d5a55a5
[PATCH] ARM: Fixup missing includes in arch/arm/mm/proc-<cputype>.S
...
For several proc-<cputype>.S files the include of proc-macros.S is
missing. Make it compile and work again.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-07-02 17:29:22 -07:00
Thomas Gleixner
284c66806e
[PATCH] genirq:fixup missing SA_PERCPU replacement
...
The irqflags consolidation converted SA_PERCPU_IRQ to IRQF_PERCPU but
did not define the new constant.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-07-02 17:29:22 -07:00
Thomas Gleixner
52e405eaa9
[PATCH] ARM: fixup irqflags breakage after ARM genirq merge
...
The irgflags consolidation did conflict with the ARM to generic IRQ
conversion and was not applied for ARM. Fix it up.
Use the new IRQF_ constants and remove the SA_INTERRUPT define
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-07-02 17:29:22 -07:00
Thomas Gleixner
d061daa0e3
[PATCH] genirq: ARM dyntick cleanup
...
Linus: "The hacks in kernel/irq/handle.c are really horrid. REALLY
horrid."
They are indeed. Move the dyntick quirks to ARM where they belong.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-07-02 17:29:21 -07:00
Linus Torvalds
f82bc1762e
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc
...
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc:
[MMC] sdhci: remove duplicate error message
[MMC] sdhci: force DMA on some controllers
[MMC] sdhci: quirk for broken reset
[MMC] sdhci: Add SDHCI controller ids
2006-07-02 16:35:07 -07:00
Dominik Hackl
4ebd9ab387
[PATCH] nfs: non-procfs build fix
...
This fixes a bug in fs/nfs which makes it impossible to build nfs
without having procfs enabled.
Signed-off-by: Dominik Hackl <dominik@hackl.dhs.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-07-02 15:10:20 -07:00
Linus Torvalds
b4b9034132
Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm
...
* 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm: (24 commits)
[ARM] 3683/2: ARM: Convert at91rm9200 to generic irq handling
[ARM] 3682/2: ARM: Convert ixp4xx to generic irq handling
[ARM] 3702/1: ARM: Convert ixp23xx to generic irq handling
[ARM] 3701/1: ARM: Convert plat-omap to generic irq handling
[ARM] 3700/1: ARM: Convert lh7a40x to generic irq handling
[ARM] 3699/1: ARM: Convert s3c2410 to generic irq handling
[ARM] 3698/1: ARM: Convert sa1100 to generic irq handling
[ARM] 3697/1: ARM: Convert shark to generic irq handling
[ARM] 3696/1: ARM: Convert clps711x to generic irq handling
[ARM] 3694/1: ARM: Convert ecard driver to generic irq handling
[ARM] 3693/1: ARM: Convert omap1 to generic irq handling
[ARM] 3691/1: ARM: Convert imx to generic irq handling
[ARM] 3688/1: ARM: Convert clps7500 to generic irq handling
[ARM] 3687/1: ARM: Convert integrator to generic irq handling
[ARM] 3685/1: ARM: Convert pxa to generic irq handling
[ARM] 3684/1: ARM: Convert l7200 to generic irq handling
[ARM] 3681/1: ARM: Convert ixp2000 to generic irq handling
[ARM] 3680/1: ARM: Convert footbridge to generic irq handling
[ARM] 3695/1: ARM drivers/pcmcia: Fixup includes
[ARM] 3689/1: ARM drivers/input/touchscreen: Fixup includes
...
Manual conflict resolved in kernel/irq/handle.c (butt-ugly ARM tickless
code).
2006-07-02 15:07:45 -07:00
Linus Torvalds
a8c4c20dfa
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
...
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (44 commits)
[ARM] 3541/2: workaround for PXA27x erratum E7
[ARM] nommu: provide a way for correct control register value selection
[ARM] 3705/1: add supersection support to ioremap()
[ARM] 3707/1: iwmmxt: use the generic thread notifier infrastructure
[ARM] 3706/2: ep93xx: add cirrus logic edb9315a support
[ARM] 3704/1: format IOP Kconfig with tabs, create more consistency
[ARM] 3703/1: Add help description for ARCH_EP80219
[ARM] 3678/1: MMC: Make OMAP MMC work
[ARM] 3677/1: OMAP: Update H2 defconfig
[ARM] 3676/1: ARM: OMAP: Fix dmtimers and timer32k to compile on OMAP1
[ARM] Add section support to ioremap
[ARM] Fix sa11x0 SDRAM selection
[ARM] Set bit 4 on section mappings correctly depending on CPU
[ARM] 3666/1: TRIZEPS4 [1/5] core
ARM: OMAP: Multiplexing for 24xx GPMC wait pin monitoring
ARM: OMAP: Fix SRAM to use MT_MEMORY instead of MT_DEVICE
ARM: OMAP: Update dmtimers
ARM: OMAP: Make clock variables static
ARM: OMAP: Fix GPMC compilation when DEBUG is defined
ARM: OMAP: Mux updates for external DMA and GPIO
...
2006-07-02 15:04:12 -07:00
Linus Torvalds
168d04b3b4
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc
...
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc:
[MMC] sdhci: version bump sdhci
[MMC] sdhci: support controller specific quirks
[MMC] sdhci: more DMA capabilities tests
[MMC] sdhci: reset sdhci controller early
[MMC] sdhci: check controller version
[MMC] sdhci: check only relevant inhibit bits
[MMC] sdhci: Test for invalid block size
[MMC] sdhci: Avoid sdhci DMA boundaries
[MMC] Fix sdhci PIO routines
[MMC] sdhci: fix interrupt handling
[MMC] sdhci: correct register order
[MMC] sdhci: proper timeout handling
[MMC] sdhci: fix sdhci reset timeout
[MMC] sdhci: fix timeout loops in sdhci
[MMC] sdhci: support for multiple voltages
[MMC] sdhci: print device id
[MMC] sdhci: check SDHCI base clock
2006-07-02 14:58:03 -07:00
Thomas Gleixner
6ce6c7faf2
[PATCH] irq-flags: documentation: Use the new IRQF_ constants
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Cc: Ingo Molnar <mingo@elte.hu >
Cc: "David S. Miller" <davem@davemloft.net >
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org >
Cc: "Randy.Dunlap" <rdunlap@xenotime.net >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-07-02 13:58:55 -07:00
Thomas Gleixner
65ca68b300
[PATCH] irq-flags: sound: Use the new IRQF_ constants
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Cc: Ingo Molnar <mingo@elte.hu >
Cc: "David S. Miller" <davem@davemloft.net >
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org >
Cc: Jaroslav Kysela <perex@suse.cz >
Cc: Takashi Iwai <tiwai@suse.de >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-07-02 13:58:54 -07:00
Thomas Gleixner
63a43399db
[PATCH] irq-flags: video: Use the new IRQF_ constants
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Cc: Ingo Molnar <mingo@elte.hu >
Cc: "David S. Miller" <davem@davemloft.net >
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org >
Cc: "Antonino A. Daplas" <adaplas@pol.net >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-07-02 13:58:53 -07:00
Thomas Gleixner
d54b5caa83
[PATCH] irq-flags: usb: Use the new IRQF_ constants
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Cc: Ingo Molnar <mingo@elte.hu >
Cc: "David S. Miller" <davem@davemloft.net >
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org >
Cc: Greg KH <greg@kroah.com >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-07-02 13:58:53 -07:00
Thomas Gleixner
40663cc7f1
[PATCH] irq-flags: serial: Use the new IRQF_ constants
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Cc: Ingo Molnar <mingo@elte.hu >
Cc: "David S. Miller" <davem@davemloft.net >
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org >
Cc: Russell King <rmk@arm.linux.org.uk >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-07-02 13:58:53 -07:00
Thomas Gleixner
1d6f359a2e
[PATCH] irq-flags: scsi: Use the new IRQF_ constants
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Cc: Ingo Molnar <mingo@elte.hu >
Cc: "David S. Miller" <davem@davemloft.net >
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org >
Cc: James Bottomley <James.Bottomley@steeleye.com >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-07-02 13:58:53 -07:00
Thomas Gleixner
5d8c8a2e8e
[PATCH] irq-flags: rio: Use the new IRQF_ constants
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Cc: Ingo Molnar <mingo@elte.hu >
Cc: "David S. Miller" <davem@davemloft.net >
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-07-02 13:58:52 -07:00
Thomas Gleixner
6b4486e2e3
[PATCH] irq-flags: pci: Use the new IRQF_ constants
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Cc: Ingo Molnar <mingo@elte.hu >
Cc: "David S. Miller" <davem@davemloft.net >
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org >
Cc: Greg KH <greg@kroah.com >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-07-02 13:58:52 -07:00
Thomas Gleixner
8c56e7214e
[PATCH] irq-flags: PARISC: Use the new IRQF_ constants
...
Use the new IRQF_ constants and remove the SA_INTERRUPT define
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Cc: Ingo Molnar <mingo@elte.hu >
Cc: "David S. Miller" <davem@davemloft.net >
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org >
Cc: Kyle McMartin <kyle@mcmartin.ca >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-07-02 13:58:52 -07:00
Thomas Gleixner
1fb9df5d30
[PATCH] irq-flags: drivers/net: Use the new IRQF_ constants
...
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
Cc: Ingo Molnar <mingo@elte.hu >
Cc: "David S. Miller" <davem@davemloft.net >
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org >
Cc: Jeff Garzik <jeff@garzik.org >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2006-07-02 13:58:51 -07:00