05 May, 2008
7 commits
-
* git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes:
fix asm-mips/types.h syntax error
fix asm-alpha/types.h breakage -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
x86: fix setup printk format warning
x86: olpc build fix
x86: video/fbdev.c: add MODULE_LICENSE
x86: fix up bootparam.h for userspace inclusion
x86: relocs ELF handling - use SELFMAG instead of numeric constant
x86: vdso ELF handling - use SELFMAG instead of numeric constant
x86: remove dell reboot dmi quirk board name match
x86: es7000 build fix
x86: make additional_cpus static
x86: make start_secondary() static
kbuild, suspend, x86: fix rebuild of wakeup.bin
uml: fix gcc problem
x86: undo visws/numaq build changes -
* 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
x86: KVM geust: make setup_secondary_clock definition dependent on local apic
KVM: MMU: Allow more than PAGES_PER_HPAGE write protections per large page
KVM: avoid fx_init() schedule in atomic
KVM: Avoid spurious execeptions after setting registers
KVM: PIT: support mode 4
KVM: x86 emulator: disable writeback on lmsw
KVM: ppc: deliver INTERRUPT_FP_UNAVAIL to the guest
KVM: ppc: Handle guest idle by emulating MSR[WE] writes
KVM: x86: task switch: fix wrong bit setting for the busy flag
KVM: VMX: Enable EPT feature for KVM
KVM: VMX: Prepare an identity page table for EPT in real mode
KVM: Export necessary function for EPT
KVM: MMU: Remove #ifdef CONFIG_X86_64 to support 4 level EPT
KVM: MMU: Add EPT support
KVM: Add kvm_x86_ops get_tdp_level()
KVM: MMU: Move some definitions to a header file
KVM: VMX: EPT Feature Detection -
x86.git testing found the following build failure on v2.6.26-rc1:
In file included from include/linux/kobject.h:22,
from include/linux/module.h:17,
from include/linux/crypto.h:22,
from arch/x86/kernel/asm-offsets_32.c:8,
from arch/x86/kernel/asm-offsets.c:3:
include/linux/sysfs.h:201: error: redefinition of 'sysfs_update_group'
include/linux/sysfs.h:195: error: previous definition of 'sysfs_update_group' was here
make[1]: *** [arch/x86/kernel/asm-offsets.s] Error 1
make: *** [prepare0] Error 2with the following config:
http://redhat.com/~mingo/misc/config-Sun_May__4_07_09_30_CEST_2008.bad
the reason for the build failure is the duplicate definition of the
sysfs_update_group() inline function in include/linux/sysfs.h.The duplication was a merge error: it was added via -mm by commit
v2.6.25-7262-g2850699, "sysfs: sysfs_update_group stub for
CONFIG_SYSFS=n" a day before v2.6.26-rc1, but a day before that the same
commit was already merged upstream via the sysfs tree, with commit
v2.6.25-7211-g1cbfb7a.Signed-off-by: Ingo Molnar
Signed-off-by: Linus Torvalds -
This patch fixes the following compile error caused by
commit 23cf11ddb5099f8c7f7cb3eb154bff0faf31cae9
(mips: types: use for the mips architecture):...
CC kernel/bounds.s
In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/types.h:12,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/page-flags.h:8,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/bounds.c:9:
include2/asm/types.h:56:2: error: #endif without #if
make[2]: *** [kernel/bounds.s] Error 1Signed-off-by: Adrian Bunk
Cc: Ralf Baechle
Signed-off-by: H. Peter Anvin -
This patch fixes the following compile error on alpha caused by
commit 3726c23df8e4d95b6f2b335dfa90e3f4850a8a00
(alpha: types: use for the alpha architecture):...
CC arch/alpha/kernel/asm-offsets.s
In file included from include2/asm/topology.h:6,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/topology.h:34,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/mmzone.h:683,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/gfp.h:4,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/slab.h:12,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/percpu.h:5,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/rcupdate.h:39,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/pid.h:4,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/sched.h:74,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/alpha/kernel/asm-offsets.c:9:
include2/asm/machvec.h:44: error: expected declaration specifiers or '...' before 'dma_addr_t'
include2/asm/machvec.h:44: error: expected declaration specifiers or '...' before 'dma_addr_t'
In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/alpha/kernel/asm-offsets.c:12:
include2/asm/io.h:94: warning: type defaults to 'int' in declaration of 'dma_addr_t'
include2/asm/io.h:94: warning: variable 'dma_addr_t' declared 'inline'
include2/asm/io.h:94: error: expected ',' or ';' before 'isa_page_to_bus'
make[2]: *** [arch/alpha/kernel/asm-offsets.s] Error 1Cc: Richard Henderson
Cc: Ivan Kokshaysky
Signed-off-by: H. Peter Anvin -
commit 8b664aa66e824a0ddf4ec56d41fa0cf7bb374de6 (x86, boot: add linked
list of struct setup_data) put a new struct in bootparam.h, but didn't
use the userspace-safe types.Signed-off-by: Rusty Russell
Cc: Huang Ying
Acked-by: H. Peter Anvin
Signed-off-by: Thomas GleixnerSigned-off-by: Ingo Molnar
04 May, 2008
14 commits
-
This make sure not to schedule in atomic during fx_init. I also
changed the name of fpu_init to fx_finit to avoid duplicating the name
with fpu_init that is already used in the kernel, this makes grep
simpler if nothing else.Signed-off-by: Andrea Arcangeli
Signed-off-by: Avi Kivity -
This reduces host CPU usage when the guest is idle. However, the guest must
set MSR[WE] in its idle loop, which Linux did not do until 2.6.26.Signed-off-by: Hollis Blanchard
Signed-off-by: Jerone Young
Signed-off-by: Avi Kivity -
Signed-off-by: Sheng Yang
Signed-off-by: Avi Kivity -
[aliguory: plug leak]
Signed-off-by: Sheng Yang
Signed-off-by: Anthony Liguori
Signed-off-by: Avi Kivity -
Enable kvm_set_spte() to generate EPT entries.
Signed-off-by: Sheng Yang
Signed-off-by: Avi Kivity -
The function get_tdp_level() provided the number of tdp level for EPT and
NPT rather than the NPT specific macro.Signed-off-by: Sheng Yang
Signed-off-by: Avi Kivity -
* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
clocksource: allow read access to available/current_clocksource
clocksource: Fix permissions for available_clocksource
hrtimer: remove duplicate helper function -
This replaces the duplicated arch-specific versions of "sys_pipe()" with
one unified implementation. This removes almost 250 lines of duplicated
code.It's marked __weak, so that *if* an architecture wants to override the
default implementation it can do so by simply having its own replacement
version, since many architectures use alternate calling conventions for
the 'pipe()' system call for legacy reasons (ie traditional UNIX
implementations often return the two file descriptors in registers)I still haven't changed the cris version even though Linus says the BKL
isn't needed. The arch maintainer can easily do it if there are really
no obstacles.Signed-off-by: Ulrich Drepper
Signed-off-by: Linus Torvalds -
* git://git.infradead.org/battery-2.6:
PMU battery: filenames in sysfs with spaces
pda_power: add init and exit function callbacks -
* git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes: (24 commits)
Make constants in kernel/timeconst.h fixed 64 bits
types: add C99-style constructors to
xtensa: types: use for the xtensa architecture
x86: types: use for the x86 architecture
v850: types: use for the v850 architecture
sparc64: types: use for the sparc64 architecture
sparc: types: use for the sparc architecture
sh: types: use for the sh architecture
s390: types: use for the s390 architecture
powerpc: types: use for the powerpc architecture
parisc: types: use for the parisc architecture
mn10300: types: use for the mn10300 architecture
mips: types: use for the mips architecture
m68k: types: use for the m68k architecture
m32r: types: use for the m32r architecture
ia64: types: use for the ia64 architecture
h8300: types: use for the h8300 architecture
frv: types: use for the frv architecture
cris: types: use for the cris architecture
blackfin: types: use for the blackfin architecture
... -
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (47 commits)
rose: Wrong list_lock argument in rose_node seqops
netns: Fix reassembly timer to use the right namespace
netns: Fix device renaming for sysfs
bnx2: Update version to 1.7.5.
bnx2: Update RV2P firmware for 5709.
bnx2: Zero out context memory for 5709.
bnx2: Fix register test on 5709.
bnx2: Fix remote PHY initial link state.
bnx2: Refine remote PHY locking.
bridge: forwarding table information for >256 devices
tg3: Update version to 3.92
tg3: Add link state reporting to UMP firmware
tg3: Fix ethtool loopback test for 5761 BX devices
tg3: Fix 5761 NVRAM sizes
tg3: Use constant 500KHz MI clock on adapters with a CPMU
hci_usb.h: fix hard-to-trigger race
dccp: ccid2.c, ccid3.c use clamp(), clamp_t()
net: remove NR_CPUS arrays in net/core/dev.c
net: use get/put_unaligned_* helpers
bluetooth: use get/put_unaligned_* helpers
... -
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc32: Delete prom_stdin and prom_stdout.
sparc32: More memory probing consolidation.
sparc32: Kill totally unused memory information tables.
sparc64: Fix syscall restart, for real...
serial: Fix sparc driver name strings.
sparc64: Stop creating dummy root PCI host controller devices. -
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Bolt in SLB entry for kernel stack on secondary cpus
[POWERPC] PS3: Update ps3_defconfig
[POWERPC] PS3: Remove unsupported wakeup sources
[POWERPC] PS3: Make ps3_virq_setup and ps3_virq_destroy static
[POWERPC] PS3: Add time include to lpm
[POWERPC] Fix slb.c compile warnings
[POWERPC] Xilinx: Fix compile warnings
[POWERPC] Squash build warning for print of resource_size_t in fsl_soc.c
[RAPIDIO] fix current kernel-doc notation
[POWERPC] 86xx: mpc8610_hpcd: add support for PCI Express x8 slot
Fix a potential issue in mpc52xx uart driver
[POWERPC] mpc5200: Allow for fixed speed MII configurations
[POWERPC] 86xx: Fix the wrong serial1 interrupt for 8610 board -
The helper function hrtimer_callback_running() is used in
kernel/hrtimer.c as well as in the updated net/can/bcm.c which now
supports hrtimers. Moving the helper function to hrtimer.h removes the
duplicate definition in the C-files.Signed-off-by: Oliver Hartkopp
Cc: David Miller
Signed-off-by: Thomas Gleixner
03 May, 2008
19 commits
-
The forwarding table binary interface (my bad choice), only exposes
the port number of the first 8 bits. The bridge code was limited to
256 ports at the time, but now the kernel supports up 1024 ports, so
the upper bits are lost when doing:brctl showmacs
The fix is to squeeze the extra bits into small hole left in data
structure, to maintain binary compatiablity.Signed-off-by: Stephen Hemminger
Signed-off-by: David S. Miller -
This adds init/exit function callbacks to pda_power, to
provide a place where the platform code can request/free
GPIOs that it wants to use in the is_ac_online, is_usb_online
and set_charge functions.Signed-off-by: Philipp Zabel
Signed-off-by: Anton Vorontsov -
Add C99-style constructor macros for fixed types to
. Since Linux uses names like "u64" instead of
"uint64_t", the constructor macros are called U64_C() instead of
UINT64_C() and so forth.These macros allow specific sizes to be specified as
U64_C(0x123456789abcdef), without gcc issuing warnings as it will if
one writes (u64)0x123456789abcdef.When used from assembly, these macros pass their argument unchanged.
Signed-off-by: H. Peter Anvin
-
This modifies to use the
generic include files.Signed-off-by: H. Peter Anvin
Cc: Chris Zankel -
This modifies to use the
generic include files.Signed-off-by: H. Peter Anvin
Cc: H. Peter Anvin
Cc: Ingo Molnar
Cc: Thomas Gleixner -
This modifies to use the
generic include files.Signed-off-by: H. Peter Anvin
-
This modifies to use the
generic include files.Signed-off-by: H. Peter Anvin
Acked-by: David S. Miller -
This modifies to use the
generic include files.Signed-off-by: H. Peter Anvin
Cc: William L. Irwin
Signed-off-by: David S. Miller -
This modifies to use the
generic include files.Signed-off-by: H. Peter Anvin
Cc: Paul Mundt -
This modifies to use the
generic include files.Signed-off-by: H. Peter Anvin
Cc: Martin Schwidefsky
Cc: Heiko Carstens -
This modifies to use the
generic include files.Signed-off-by: H. Peter Anvin
Cc: Paul Mackerras
Cc: Anton Blanchard -
This modifies to use the
generic include files.Signed-off-by: H. Peter Anvin
Cc: Kyle McMartin
Cc: Matthew Wilcox
Cc: Grant Grundler -
This modifies to use the
generic include files.Signed-off-by: H. Peter Anvin
Cc: David Howells
Cc: Koichi Yasutake -
This modifies to use the
generic include files.Signed-off-by: H. Peter Anvin
Cc: Ralf Baechle -
This modifies to use the
generic include files.Signed-off-by: H. Peter Anvin
Cc: Geert Uytterhoeven
Cc: Roman Zippel -
This modifies to use the
generic include files.Signed-off-by: H. Peter Anvin
Cc: Hirokazu Takata -
This modifies to use the
generic include files.Signed-off-by: H. Peter Anvin
Acked-by: Tony Luck -
This modifies to use the
generic include files.Signed-off-by: H. Peter Anvin
Cc: Yoshinori Sato -
This modifies to use the
generic include files.Signed-off-by: H. Peter Anvin
Cc: David Howells
