19 May, 2008
15 commits
-
The *_ISA type defines are quite generic and cause namespace conflicts
(e.g. with `AMIGAHW_DECLARE(GG2_ISA)' in ) for some kernel
configurations. Use ISA_TYPE_* to avoid such conflicts.Signed-off-by: Geert Uytterhoeven
Signed-off-by: Linus Torvalds -
UIO needs m68k_mmutype:
ERROR: "m68k_mmutype" [drivers/uio/uio.ko] undefined!
(noticed by Christian T. Steigies)
Signed-off-by: Geert Uytterhoeven
Signed-off-by: Linus Torvalds -
Mark Q40/Q60 floppy support broken:
arch/m68k/q40/q40ints.c: In function 'q40_irq_handler':
arch/m68k/q40/q40ints.c:214: error: implicit declaration of function 'floppy_hardint'Including doesn't help, as it causes a lot of additional error
messages (cfr. Sun 3x).Signed-off-by: Geert Uytterhoeven
Signed-off-by: Linus Torvalds -
According to the tests in do_initcalls(), the proper error code in case no
device is found is -ENODEV, not -ENXIO or -EIO.Signed-off-by: Geert Uytterhoeven
Signed-off-by: Linus Torvalds -
Some input drivers do not check whether they're actually running on the
correct platform, causing multi-platform kernels to crash if they are not.Signed-off-by: Geert Uytterhoeven
Signed-off-by: Linus Torvalds -
Some network drivers do not check whether they're actually running on the
correct platform, causing multi-platform kernels to crash if they are not.Signed-off-by: Geert Uytterhoeven
Signed-off-by: Linus Torvalds -
The Apollo frame buffer device driver (dnfb) doesn't check whether it's
actually running on Apollo hardware, causing a crash if it isn't.Signed-off-by: Geert Uytterhoeven
Signed-off-by: Linus Torvalds -
The Macintosh IDE driver (macide) doesn't check whether it's actually running
on Mac hardware, causing a crash if it isn't.Signed-off-by: Geert Uytterhoeven
Signed-off-by: Linus Torvalds -
When running a HP300-enabled kernel on non-HP300 hardware, a test in the early
startup code jumps to the wrong label, causing a double bus fault.Signed-off-by: Geert Uytterhoeven
Signed-off-by: Linus Torvalds -
Use `__builtin_trap()' instead of `asm volatile("illegal")' in the m68k BUG()
macros (as suggested by Andrew Pinski), to kill warnings in code that assumes
BUG() does not return.Signed-off-by: Geert Uytterhoeven
Signed-off-by: Linus Torvalds -
m68k vme_scc:
- make scc_ports[] static
- kill unused global scc_initializedSigned-off-by: Geert Uytterhoeven
Signed-off-by: Linus Torvalds -
The Hisoft Whippet PCMCIA serial driver has been removed a long time ago, but
it's Kconfig symbol still existed.Signed-off-by: Geert Uytterhoeven
Signed-off-by: Linus Torvalds -
Correct FB_HP300 dependencies:
- FB_HP300 doesn't depend only on HP300, but also on DIO (which depends on
HP300)
- FB_HP300 does not need FB_CFB_FILLRECTSigned-off-by: Geert Uytterhoeven
Signed-off-by: Linus Torvalds -
CONFIG_FB_DAFB is a leftover from pre-Kconfig
Signed-off-by: Geert Uytterhoeven
Signed-off-by: Linus Torvalds -
Convert access_ok() from a macro to an inline function, so the compiler no
longer complains about unused variables:fs/read_write.c: In function 'rw_copy_check_uvector':
fs/read_write.c:556: warning: unused variable 'buf'Signed-off-by: Geert Uytterhoeven
Signed-off-by: Linus Torvalds
18 May, 2008
16 commits
-
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] pxa: spitz wants PXA27x UDC definitions
[ARM] pxa: fix pxafb build when cpufreq is enabled
[ARM] fix parenthesis in include/asm-arm/arch-omap/control.h
[ARM] colibri: fix support for DM9000 ethernet device
[ARM] arm/kernel/arthur.c: add MODULE_LICENSE
[ARM] 5037/1: Orion: fix DNS323/Kurobox Pro PCI initialisation
[ARM] 5034/1: fix arm{925,926,940,946} dma_flush_range() in WT mode
[ARM] export copy_page
[ARM] 5026/1: locomo: add .settype for gpio and several small fixes
ARM: OMAP: Fixed comments on global PRM register usage
ARM: OMAP: Add PARENT_CONTROLS_CLOCK flag to dpll5_m2_ck
ARM: OMAP: PRCM fixes to ssi clock handling
ARM: OMAP: Add fuctional clock enabler for iva2
ARM: OMAP: Fix 34xx to use correct shift values for gpio2-6 fclks
ARM: OMAP: Keymap fix for palmte and palmz71
ARM: OMAP: Fix Unbalanced enable for IRQ in omap mailbox
ARM: OMAP: DMA: Fix incorrect channel linking
ARM: OMAP: Warn on disabling clocks with no users
ARM: OMAP: Add calls to omap2_set_globals_*()
ARM: OMAP: Update MMC header to fix compile -
... so include the header file.
Signed-off-by: Russell King
-
If cpufreq is enabled, pxafb wants to call the removed
get_clk_frequency_khz() function for a debug printk. Remove
this reference.Signed-off-by: Russell King
-
Parenthesis fix in include/asm-arm/arch-omap/control.h
Signed-off-by: Mariusz Kozlowski
Cc: Paul Walmsley
Cc: Tony Lindgren
Signed-off-by: Andrew Morton
Signed-off-by: Russell King -
Two changes are necessary to enable proper operation of the DM9000 device with
the Colibri PXA 270 board: firstly, the IRQ type needs to be configured for
rising edge interrupts, and secondly this configuration needs to be
communicated through to the DM9000.[akpm@linux-foundation.org: remove set_irq_type() call as per ben-linux request]
Signed-off-by: Michael Abbott
Cc: Daniel Mack
Cc: Jeff Garzik
Cc: Ben Dooks
Signed-off-by: Andrew Morton
Signed-off-by: Russell King -
This patch adds the missing MODULE_LICENSE("GPL").
Signed-off-by: Adrian Bunk
Signed-off-by: Russell King -
Whereas most Orion 5x machine support code would initialise the PCI
subsystem with nr_controllers in their struct hw_pci set to 2, the
DNS323 and Kurobox Pro machine support code had nr_controllers set
to 1.This was presumably done because on those two machines, the PCI(-X)
controller (nr == 1) isn't used, requiring initialisation of only
the PCIe controller (nr == 0.) However, not initialising the PCI(-X)
controller on boards that don't use it leads to a situation where
both the PCIe and the PCI(-X) controller think that their root bus is
zero, and it messes up IRQ assignment.This patch changes the DNS323 and Kurobox Pro support code to always
use nr_controllers == 2.Signed-off-by: Lennert Buytenhek
Signed-off-by: Russell King -
The CPU's dma_flush_range() operation needs to clean+invalidate the
given memory area if the cache is in writeback mode, or do just the
invalidate part if the cache is in writethrough mode, but the current
proc-arm{925,926,940,946} (incorrectly) do a cache clean in the
latter case. This patch fixes that.Signed-off-by: Lennert Buytenhek
Signed-off-by: Russell King -
Martin Michlmayr reported that fuse complains:
ERROR: "copy_page" [fs/fuse/fuse.ko] undefined!so export the needed function.
Signed-off-by: Russell King
-
irqs.h:
* rename IRQ_LOCOMO_SPI_OVRN to IRQ_LOCOMO_SPI_REND
locomo.h:
* add some definition for locomo spi controller
* correct some errors
locomo.c:
* correct some errors
* add set_type for locomo gpio irq chipSigned-off-by: Thomas Kunze
Signed-off-by: Russell King -
…git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: disable mwait for AMD family 10H/11H CPUs
x86: fix crash on cpu hotplug on pat-incapable machines
x86: remove mwait capability C-state check -
The previous revert of 0c07ee38c9d4eb081758f5ad14bbffa7197e1aec left
out the mwait disable condition for AMD family 10H/11H CPUs.Andreas Herrman said:
It depends on the CPU. For AMD CPUs that support MWAIT this is wrong.
Family 0x10 and 0x11 CPUs will enter C1 on HLT. Powersavings then
depend on a clock divisor and current Pstate of the core.If all cores of a processor are in halt state (C1) the processor can
enter the C1E (C1 enhanced) state. If mwait is used this will never
happen.Thus HLT saves more power than MWAIT here.
It might be best to switch off the mwait flag for these AMD CPU
families like it was introduced with commit
f039b754714a422959027cb18bb33760eb8153f0 (x86: Don't use MWAIT on AMD
Family 10)Re-add the AMD families 10H/11H check and disable the mwait usage for
those.Signed-off-by: Thomas Gleixner
-
pat_disable() is __init, which means it goes away after booting is complete.
Unfortunately it is used by the hotplug code if the machine is not
pat-capable, causing a crash.Fix by marking pat_disable() as __cpuinit.
Signed-off-by: Avi Kivity
Signed-off-by: Ingo Molnar -
Vegard Nossum reports:
| powertop shows between 200-400 wakeups/second with the description
| ": Rescheduling interrupts" when all processors have load (e.g.
| I need to run two busy-loops on my 2-CPU system for this to show up).
|
| The bisect resulted in this commit:
|
| commit 0c07ee38c9d4eb081758f5ad14bbffa7197e1aec
| Date: Wed Jan 30 13:33:16 2008 +0100
|
| x86: use the correct cpuid method to detect MWAIT support for C statesremove the functional effects of this patch and make mwait unconditional.
A future patch will turn off mwait on specific CPUs where that causes
power to be wasted.Bisected-by: Vegard Nossum
Tested-by: Vegard Nossum
Signed-off-by: Ingo Molnar
17 May, 2008
4 commits
-
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Update defconfig.
sparc64: Fix lmb_reserve() args in find_ramdisk(). -
Signed-off-by: David S. Miller
-
This fixes the missing ram regression reported by
Mikael Pettersson , much thanks for
all of this help in diagnosing this.The second argument to lmb_reserve() is a size,
not an end address bounds.Tested-by: Mikael Pettersson
Signed-off-by: David S. Miller
-
Use asm/byteorder.h instead.
Signed-off-by: Harvey Harrison
Signed-off-by: Linus Torvalds
16 May, 2008
5 commits
-
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] macintosh: Replace deprecated __initcall with device_initcall
[POWERPC] cell: Fix section mismatches in io-workarounds code
[POWERPC] spufs: Fix compile error
[POWERPC] Fix uninitialized variable bug in copy_{to|from}_user
[POWERPC] Add null pointer check to of_find_property
[POWERPC] vmemmap fixes to use smaller pages
[POWERPC] spufs: Fix pointer reference in find_victim
[POWERPC] 85xx: SBC8548 - Add flash support and HW Rev reporting
[POWERPC] 85xx: Fix some sparse warnings for 85xx MDS
[POWERPC] 83xx: Enable DMA engine on the MPC8377 MDS board.
[POWERPC] 86xx: mpc8610_hpcd: fix second serial port
[POWERPC] 86xx: mpc8610_hpcd: add support for NOR and NAND flashes
[POWERPC] 85xx: Add 8568 PHY workarounds to board code
[POWERPC] 86xx: mpc8610_hpcd: use ULI526X driver for on-board ethernet -
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
jbd2: update transaction t_state to T_COMMIT fix
ext4: Retry block allocation if new blocks are allocated from system zone.
ext4: mballoc fix mb_normalize_request algorithm for 1KB block size filesystems
ext4: fix typos in messages and comments (journalled -> journaled)
ext4: fix synchronization of quota files in journal=data mode
ext4: Fix mount messages when quota disabled
ext4: correct mount option parsing to detect when quota options can be changed -
This patch fixes a build bug on m68k - gcc decides to emit a call to the
strlen library function, which we don't implement.More importantly - my previous patch "init: don't lose initcall return
values" (commit e662e1cfd434aa234b72fbc781f1d70211cb785b) had introduced
potential buffer overflow by wrong calculation of string accumulator
size.Use strlcat() instead, fixing both bugs.
Many thanks Andreas Schwab and Geert Uytterhoeven for helping
to catch and fix the bug.Signed-off-by: Cyrill Gorcunov
Cc: Geert Uytterhoeven
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
One function to just loop over the entries, one function to actually do
the call and the associated debugging code.Signed-off-by: Linus Torvalds
-
Everybody wants to pass it a function pointer, and in fact, that is what
you _must_ pass it for it to make sense (since it knows that ia64 and
ppc64 use descriptors for function pointers and fetches the actual
address from there).So don't make the argument be a 'unsigned long' and force everybody to
add a cast.Signed-off-by: Linus Torvalds
