linux/arch/x86/lib
Linus Torvalds 60812a4a99 Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86
* ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86: (33 commits)
  x86: convert cpuinfo_x86 array to a per_cpu array
  x86: introduce frame_pointer() and stack_pointer()
  x86 & generic: change to __builtin_prefetch()
  i386: do not BUG_ON() when MSR is unknown
  x86: acpi use cpu_physical_id
  x86: convert cpu_llc_id to be a per cpu variable
  x86: convert cpu_to_apicid to be a per cpu variable
  i386: introduce "used_vectors" bitmap which can be used to reserve vectors.
  x86: use raw locks during oopses
  x86: honor _PAGE_PSE bit on page walks
  i386: do cpuid_device_create() in CPU_UP_PREPARE instead of CPU_ONLINE.
  x86: implement missing x86_64 function smp_call_function_mask()
  x86: use descriptor's functions instead of inline assembly
  i386: consolidate show_regs and show_registers for i386
  i386: make callgraph use dump_trace() on i386/x86_64
  x86: enable iommu_merge by default
  i386: i386 add AMD64 Barcelona PMU MSR definitions to msr.h
  x86: Unify i386 and x86-64 early quirks
  x86: enable HPET on ICH3 and ICH4
  x86: force enable HPET on VT8235/8237 chipsets
  ...

Manually fix trivial conflict with task pid container helper changes in
arch/x86/kernel/process_32.c
2007-10-19 15:06:00 -07:00
..
bitops_32.c i386: move lib 2007-10-11 11:16:33 +02:00
bitops_64.c x86_64: move lib 2007-10-11 11:17:08 +02:00
bitstr_64.c x86: fix off-by-one in find_next_zero_string 2007-10-17 20:15:22 +02:00
checksum_32.S i386: move lib 2007-10-11 11:16:33 +02:00
clear_page_64.S x86_64: move lib 2007-10-11 11:17:08 +02:00
copy_page_64.S x86_64: move lib 2007-10-11 11:17:08 +02:00
copy_user_64.S x86_64: move lib 2007-10-11 11:17:08 +02:00
copy_user_nocache_64.S x86: fence oostores on 64-bit 2007-10-12 18:41:21 -07:00
csum-copy_64.S x86_64: move lib 2007-10-11 11:17:08 +02:00
csum-partial_64.c x86_64: move lib 2007-10-11 11:17:08 +02:00
csum-wrappers_64.c x86_64: move lib 2007-10-11 11:17:08 +02:00
delay_32.c x86: convert cpuinfo_x86 array to a per_cpu array 2007-10-19 20:35:04 +02:00
delay_64.c x86: convert cpuinfo_x86 array to a per_cpu array 2007-10-19 20:35:04 +02:00
getuser_32.S i386: move lib 2007-10-11 11:16:33 +02:00
getuser_64.S x86_64: move lib 2007-10-11 11:17:08 +02:00
io_64.c x86_64: move lib 2007-10-11 11:17:08 +02:00
iomap_copy_64.S x86_64: move lib 2007-10-11 11:17:08 +02:00
Makefile x86_64: move lib 2007-10-11 11:17:08 +02:00
Makefile_32 i386: move lib 2007-10-11 11:16:33 +02:00
Makefile_64 x86_64: move lib 2007-10-11 11:17:08 +02:00
memcpy_32.c i386: move lib 2007-10-11 11:16:33 +02:00
memcpy_64.S x86_64: move lib 2007-10-11 11:17:08 +02:00
memmove_64.c x86_64: move lib 2007-10-11 11:17:08 +02:00
memset_64.S x86_64: move lib 2007-10-11 11:17:08 +02:00
mmx_32.c i386: move lib 2007-10-11 11:16:33 +02:00
msr-on-cpu.c i386: simplify smp_call_function_single() call sequence in msr-on-cpu 2007-10-17 20:16:20 +02:00
putuser_32.S i386: move lib 2007-10-11 11:16:33 +02:00
putuser_64.S x86_64: move lib 2007-10-11 11:17:08 +02:00
rwlock_64.S x86: rename .i assembler includes to .h 2007-10-17 20:16:29 +02:00
semaphore_32.S x86: rename .i assembler includes to .h 2007-10-17 20:16:29 +02:00
string_32.c i386: Remove strrchr assembler implementation 2007-10-17 20:16:23 +02:00
strstr_32.c i386: move lib 2007-10-11 11:16:33 +02:00
thunk_64.S lockdep: x86_64: connect the sysexit hook 2007-10-11 22:11:12 +02:00
usercopy_32.c pid namespaces: define is_global_init() and is_container_init() 2007-10-19 11:53:37 -07:00
usercopy_64.c x86_64: move lib 2007-10-11 11:17:08 +02:00