17 Oct, 2008
1 commit
-
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
14 Oct, 2008
5 commits
-
* git://git.infradead.org/users/dwmw2/random-2.6:
Fix autoloading of MacBook Pro backlight driver.
Automatic MODULE_ALIAS() for DMI match tables.
Remove asm/a.out.h files for all architectures without a.out support.
Introduce HAVE_AOUT symbol to remove hard-coded arch list for BINFMT_AOUT
Remove redundant CONFIG_ARCH_SUPPORTS_AOUT
S390: Update comments about why we don't use
SPARC: Use
PowerPC: Use
PARISC: Use
x86_64: Use
IA64: Use
ARM: Use
Make suitable for 64-bit platforms.
Define and use PCI_DEVICE_ID_MARVELL_88ALP01_CCIC for CAFÉ camera driver
[MTD] [NAND] Define and use PCI_DEVICE_ID_MARVELL_88ALP01_NAND for CAFÉ
Use PCI_DEVICE_ID_88ALP01 for CAFÉ chip, rather than PCI_DEVICE_ID_CAFE.
EFS: Don't set f_fsid in statfs(). -
Merges oprofile, timers/hpet, x86/traps, x86/time, and x86/core misc items.
* 'x86-core-v4-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (132 commits)
x86: change early_ioremap to use slots instead of nesting
x86: adjust dependencies for CONFIG_X86_CMOV
dumpstack: x86: various small unification steps, fix
x86: remove additional_cpus
x86: remove additional_cpus configurability
x86: improve UP kernel when CPU-hotplug and SMP is enabled
dumpstack: x86: various small unification steps
dumpstack: i386: make kstack= an early boot-param and add oops=panic
dumpstack: x86: use log_lvl and unify trace formatting
dumptrace: x86: consistently include loglevel, print stack switch
dumpstack: x86: add "end" parameter to valid_stack_ptr and print_context_stack
dumpstack: x86: make printk_address equal
dumpstack: x86: move die_nmi to dumpstack_32.c
traps: x86: finalize unification of traps.c
traps: x86: make traps_32.c and traps_64.c equal
traps: x86: various noop-changes preparing for unification of traps_xx.c
traps: x86_64: use task_pid_nr(tsk) instead of tsk->pid in do_general_protection
traps: i386: expand clear_mem_error and remove from mach_traps.h
traps: x86_64: make io_check_error equal to the one on i386
traps: i386: use preempt_conditional_sti/cli in do_int3
... -
We need a way to describe the various additional modes and flow control
features that random weird hardware shows up and software such as wine
wants to emulate as Windows supports them.TCGETX/TCSETX and the termiox ioctl are a SYS5 extension that we might as
well adopt. This patches adds the structures and the basic ioctl interfaces
when the TCGETX etc defines are added for an architecture. Drivers wishing
to use this stuff need to add new methods.Signed-off-by: Alan Cox
Signed-off-by: Linus Torvalds -
JP Tosoni observed:
"About a RS485 ioctl: could you consider the attached files which are
already in the Linux kernel (in include/asm-cris). They define a
TIOCSERSETRS485 (ioctl.h), and the data structure (rs485.h)
with allows to specify timings. Sounds just like what we want ?"and he's right: sort of. Rework the structure to use flag bits and make the
time delay a fixed sized field so we don't get 32/64bit problems. Add the ioctls
to x86 so that people know what to add to their platform of choice.Signed-off-by: Alan Cox
Signed-off-by: Linus Torvalds -
Conflicts:
include/asm-x86/statfs.h
13 Oct, 2008
22 commits
-
so we could remove the requirement that one needs to call
early_iounmap() in exactly reverse order of early_ioremap().Signed-off-by: Yinghai Lu
Signed-off-by: Ingo Molnar -
- reordering include files
- whitespace changes
- comment changes
- removed unused bad_intr()
- make default_do_nmi staticSigned-off-by: Alexander van Heukelum
Signed-off-by: Ingo Molnar -
This is the last user of clear_mem_error, which is defined
only on i386. Expand the inline function and remove it from
include/asm-x86/mach-default/mach_traps.hSigned-off-by: Alexander van Heukelum
Signed-off-by: Ingo Molnar -
- set_system_gate on i386 is really set_system_trap_gate
- set_system_gate on x86_64 is really set_system_intr_gate
- ist=0 means no special stack switch is done:
- introduce STACKFAULT_STACK, DOUBLEFAULT_STACK, NMI_STACK,
DEBUG_STACK and MCE_STACK as on x86_64.
- use the _ist variants with XXX_STACK set to zero
- remove set_system_gateSigned-off-by: Alexander van Heukelum
Signed-off-by: Ingo Molnartraps: x86: correct copy/paste bug: a trap is a GATE_TRAP
Fix copy/paste/forgot-to-edit bug in desc.h.
Signed-off-by: Alexander van Heukelum
Signed-off-by: Ingo Molnar -
Make the x86_64-version and the i386-version of do_debug
more similar.- introduce preempt_conditional_sti/cli to i386. The preempt-count
is now elevated during the trap handler, like on x86_64. It
does not run on a separate stack, however.
- replace an open-coded "send_sigtrap"
- copy some commentsSigned-off-by: Alexander van Heukelum
Signed-off-by: Ingo Molnar -
Mark the exception handlers with "dotraplinkage" to hide the
calling convention differences between i386 and x86_64.Signed-off-by: Alexander van Heukelum
Signed-off-by: Ingo Molnar -
Split out math_error from do_coprocessor_error and simd_math_error
from do_simd_coprocessor_error, like on i386. While at it, add the
"error_code" parameter to do_coprocessor_error, do_simd_coprocessor_error
and do_spurious_interrupt_bug.This does not change the generated code, but brings the declarations in
line with all the other trap handlers.Signed-off-by: Alexander van Heukelum
Signed-off-by: Ingo Molnar -
virt_addr_valid() calls __pa(), which calls __phys_addr(). With
CONFIG_DEBUG_VIRTUAL=y, __phys_addr() will kill the kernel if the
address *isn't* valid. That's clearly wrong for virt_addr_valid().We also incorporate the debugging checks into virt_addr_valid().
Signed-off-by: Vegard Nossum
Acked-by: Jiri Slaby
Signed-off-by: Ingo Molnar -
Currently the low-level function to dump user-passed registers on i386 is
called __show_registers() whereas on x86-64 it's called __show_regs(). Unify
the API to simplify porting of kmemcheck to x86-64.Signed-off-by: Pekka Enberg
Acked-by: Vegard Nossum
Signed-off-by: Ingo Molnar -
Commit 4a701737 ("x86: move prefill_possible_map calling early, fix")
is the wrong fix: prefill_possible_map() needs to be available
even when CONFIG_HOTPLUG_CPU is not set. A followon patch will do that.Fix this correctly by making prefill_possible_map() available even when
CONFIG_HOTPLUG_CPU is not set. The function is needed so that
the number of possible CPUs can be determined.Tested on uniprocessor machine with CPU hotplug disabled.
From boot log:
Before: NR_CPUS: 512, nr_cpu_ids: 512, nr_node_ids 1
After: NR_CPUS: 512, nr_cpu_ids: 1, nr_node_ids 1Signed-off-by: Chuck Ebbert
Signed-off-by: Ingo Molnar -
The Winchip-2 and Winchip-2A cpu choices select the
same options for kernel and compiler.Merge them to save few bytes and reduce confusion.
Signed-off-by: Krzysztof Helt
Acked-by: H. Peter Anvin
Signed-off-by: Ingo Molnar -
The last use of trace_hardirqs_fixup is unnecessary, because the
trap is taken with interrupt off on i386 as well as x86_64, and
the irq-tracer is notified of this from the assembly code.trace_hardirqs_fixup and trace_hardirqs_fixup_flags are removed
from include/asm-x86/irqflags.h as they are no longer used.Signed-off-by: Alexander van Heukelum
Signed-off-by: Ingo Molnar -
There are no users in the kernel.
Signed-off-by: Glauber Costa
Signed-off-by: Ingo Molnar -
Instead of using SEGMENT_IS_KERNEL_CODE, use the
"user_mode" macro, which can play the same role. Delete
the former, since it now lacks any user.Signed-off-by: Glauber Costa
Signed-off-by: Ingo Molnar -
Since pte_flags() is much cheaper than pte_val() in some virtualized
environments (namely, Xen), use the former whereever possible.Signed-off-by: Jan Beulich
Cc: "Nick Piggin"
Signed-off-by: Ingo Molnar -
Segment registers are reloaded, so we should add a memory clobber. The
generated assembly code is identical in my tests, but this doesn't mean
it is necessarily true for all configurations/compilers.x86_64 already has the memory clobber.
Signed-off-by: Vegard Nossum
Signed-off-by: Ingo Molnar -
v2: use __acpi_unmap_table()
Signed-off-by: Yinghai Lu
Signed-off-by: Ingo Molnar -
early_ioremap() is also used to map normal memory when constructing
the linear memory mapping. However, since we sometimes need to be able
to distinguish between actual IO mappings and normal memory mappings,
add a early_memremap() call, which maps with PAGE_KERNEL (as opposed
to PAGE_KERNEL_IO for early_ioremap()), and use it when constructing
pagetables.Signed-off-by: Jeremy Fitzhardinge
Signed-off-by: Ingo Molnar -
early_ioremap() is redeclared in several places; remove them.
Signed-off-by: Jeremy Fitzhardinge
Signed-off-by: Ingo Molnar -
Use one of the software-defined PTE bits to indicate that a mapping is
intended for an IO address. On native hardware this is irrelevent,
since a physical address is a physical address. But in a virtual
environment, physical addresses are also virtualized, so there needs
to be some way to distinguish between pseudo-physical addresses and
actual hardware addresses; _PAGE_IOMAP indicates this intent.By default, __supported_pte_mask masks out _PAGE_IOMAP, so it doesn't
even appear in the final pagetable.Signed-off-by: Jeremy Fitzhardinge
Signed-off-by: Ingo Molnar -
x86_64 uses a helper function conditional_sti in traps_64.c which
is equal to restore_interrupts in kprobes.h. The only user of
restore_interrupts is in traps_32.c. Introduce conditional_sti
for i386 and remove restore_interrupts.Signed-off-by: Alexander van Heukelum
Signed-off-by: Ingo Molnar -
Just like for 32-bit - as 256 entries are needed, aligning to a
256-entry boundary is sufficient and still guarantees the single pte
table requirement.Likewise move up __end_of_permanent_fixed_addresses, to match 32-bit.
Signed-off-by: Jan Beulich
Signed-off-by: Ingo Molnar
12 Oct, 2008
8 commits
-
…memory-corruption-check', 'x86/early-printk', 'x86/xsave', 'x86/ptrace-v2', 'x86/quirks', 'x86/setup', 'x86/spinlocks' and 'x86/signal' into x86/core-v2
-
Move the prototypes from the generic kernel.h header to the more
appropriate include/asm-x86/bios_ebda.h header file.Also, remove the check from the power management code - this is a
pure x86 matter for now.Signed-off-by: Ingo Molnar
-
Conflicts:
include/asm-x86/spinlock.h -
Done to prevent this failure of an Octopus merge:
Added arch/arm/include/asm/byteorder.h in both, but differently.
ERROR: Merge conflict in arch/arm/include/asm/byteorder.h
Auto-merging include/asm-x86/spinlock.h
ERROR: Merge conflict in include/asm-x86/spinlock.h
fatal: merge program failed -
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process_64.c
arch/x86/xen/enlighten.c -
Conflicts:
arch/x86/kernel/signal_64.c -
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/signal_64.c
include/asm-x86/cpufeature.h -
Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/kernel/apic_64.c
arch/x86/kernel/setup.c
drivers/pci/intel-iommu.c
include/asm-x86/cpufeature.h
include/asm-x86/dma-mapping.h
11 Oct, 2008
4 commits
-
Conflicts:
arch/x86/kernel/pci-gart_64.c
include/asm-x86/dma-mapping.h -
Conflicts:
arch/x86/mm/init_64.c -
Track the memtype for RAM pages in page struct instead of using the
memtype list. This avoids the explosion in the number of entries in
memtype list (of the order of 20,000 with AGP) and makes the PAT
tracking simpler.We are using PG_arch_1 bit in page->flags.
We still use the memtype list for non RAM pages.
Signed-off-by: Suresh Siddha
Signed-off-by: Venkatesh Pallipadi
Signed-off-by: Ingo Molnar -
Interrupt context no longer splits large page in cpa(). So we can do away
with cpa memory pool code.Signed-off-by: Suresh Siddha
Cc: Suresh Siddha
Cc: arjan@linux.intel.com
Cc: venkatesh.pallipadi@intel.com
Cc: jeremy@goop.org
Signed-off-by: Ingo Molnar
