06 Mar, 2009
1 commit
-
Conflicts:
arch/x86/Kconfig
block/blktrace.c
kernel/irq/handle.cSemantic conflict:
kernel/trace/blktrace.cSigned-off-by: Ingo Molnar
03 Mar, 2009
1 commit
-
The current definition of CALLER_ADDRx isn't suitable for all platforms.
E.g. for ARM __builtin_return_address(N) doesn't work for N > 0 and
AFAIK for powerpc there are no frame pointers needed to have a working
__builtin_return_address. This patch allows defining the CALLER_ADDRx
macros in and let these take precedence.Because now is included unconditionally in
all archs that don't already had this include get an
empty one for free.Signed-off-by: Uwe Kleine-Koenig
Cc: Peter Zijlstra
Cc: Ingo Molnar
Reviewed-by: KOSAKI Motohiro
Signed-off-by: Steven Rostedt
14 Feb, 2009
1 commit
-
Conflicts:
arch/x86/include/asm/setup.h
06 Feb, 2009
1 commit
-
Conflicts:
arch/x86/mach-default/setup.cSemantic merge:
arch/x86/kernel/irqinit_32.cSigned-off-by: Ingo Molnar
01 Feb, 2009
2 commits
-
fix the following 'make headers_check' warnings:
usr/include/asm-parisc/swab.h:4: include of is preferred over
usr/include/asm-parisc/swab.h:9: found __[us]{8,16,32,64} type without #includeSigned-off-by: Jaswinder Singh Rajput
-
fix the following 'make headers_check' warning:
usr/include/asm-parisc/pdc.h:420: found __[us]{8,16,32,64} type without #include
Signed-off-by: Jaswinder Singh Rajput
30 Jan, 2009
1 commit
-
Move DMA-mapping.txt to Documentation/PCI/.
DMA-mapping.txt was supposed to be moved from Documentation/ to
Documentation/PCI/. The 00-INDEX files in those two directories
were updated, along with a few other text files, but the file
itself somehow escaped being moved, so move it and update more
text files and source files with its new location.Signed-off-by: Randy Dunlap
Acked-by: Greg Kroah-Hartman
cc: Jesse Barnes
Signed-off-by: Linus Torvalds
21 Jan, 2009
1 commit
-
Conflicts:
arch/x86/mm/fault.c
15 Jan, 2009
1 commit
-
Add swab.h to kbuild.asm and remove the individual entries from
each arch, mark as unifdef as some arches have some kernel-only
bits inside.Signed-off-by: Harvey Harrison
Signed-off-by: Linus Torvalds
13 Jan, 2009
1 commit
-
Impact: cleanup, update to new cpumask API
Irq_desc.affinity and irq_desc.pending_mask are now cpumask_var_t's
so access to them should be using the new cpumask API.Signed-off-by: Mike Travis
10 Jan, 2009
2 commits
-
Fix for the linux/byteorder.h removal.
Signed-off-by: Harvey Harrison
Signed-off-by: Linus Torvalds -
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
parisc: export length of os_hpmc vector
parisc: fix kernel crash (protection id trap) when compiling ruby1.9
parisc: Use DEFINE_SPINLOCK
parisc: add uevent helper for parisc bus
parisc: fix ipv6 checksum
parisc: quiet palo not-found message from "which"
parisc: Replace NR_CPUS in parisc code
parisc: trivial fixes
parisc: fix braino in commit adding __space_to_prot
parisc: factor out sid to protid conversion
parisc: use leX_to_cpu in place of __fswabX
parisc: fix GFP_KERNEL use while atomic in unwinder
parisc: remove dead BIO_VMERGE_BOUNDARY and BIO_VMERGE_MAX_SIZE definitions
parisc: set_time() catch errors
parisc: use the new byteorder headers
parisc: drivers/parisc/: make code static
parisc: lib/: make code static
07 Jan, 2009
1 commit
-
The atomic_t type cannot currently be used in some header files because it
would create an include loop with asm/atomic.h. Move the type definition
to linux/types.h to break the loop.Signed-off-by: Matthew Wilcox
Cc: Huang Ying
Cc:
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
06 Jan, 2009
15 commits
-
and use this instead of dealing with exporting start/end and
toying with function descriptors.Signed-off-by: Kyle McMartin
-
On Wed, Dec 17, 2008 at 11:46:05PM +0100, Helge Deller wrote:
>Honestly, I can't decide whether to apply this. It really should never
happen in the kernel, since the kernel can guarantee it won't get the
access rights failure (highest privilege level, and can set %sr and
%protid to whatever it wants.)It really genuinely is a bug that probably should panic the kernel. The
only precedent I can easily see is x86 fixing up a bad iret with a
general protection fault, which is more or less analogous to code 27
here.On the other hand, taking the exception on a userspace access really
isn't all that critical, and there's fundamentally little reason for the
kernel not to SIGSEGV the process, and continue...Argh.
(btw, I've instrumented my do_sys_poll with a pile of assertions that
%cr8 << 1 == %sr3 == current->mm.context... let's see if where we're
getting corrupted is deterministic, though, I would guess that it won't
be.)Signed-off-by: Kyle McMartin
-
SPIN_LOCK_UNLOCKED is deprecated. The following makes the change suggested
in Documentation/spinlocks.txtThe semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)//
@@
declarer name DEFINE_SPINLOCK;
identifier xxx_lock;
@@- spinlock_t xxx_lock = SPIN_LOCK_UNLOCKED;
+ DEFINE_SPINLOCK(xxx_lock);
//Signed-off-by: Julia Lawall
Signed-off-by: Kyle McMartin -
parisc: add uevent helper for parisc bus
udev device-driver auto detection was failing to work on the GSC bus, since
udev didn't knew wich driver to load due to a missing MODALIAS environment
variable from kernel.This patch fixes this by adding the MODALIAS environment variable to the
uevent kernel notifications.
Since modalias_show() generated the modalias string already, I splitted this
out and created a new static function make_modalias() which is now used by
modalias_show() and the new parisc_uevent() function.Tested on 715/64 and c3000.
Signed-off-by: Helge Deller
Signed-off-by: Kyle McMartin -
ipv6 recently started exhibiting the same symptoms as ipv4 was, add
a memory clobber around inline checksum assembly that fribbles memory
to ensure gcc doesn't erroneously cache across it.Signed-off-by: Kyle McMartin
-
Reduces moaning when building on a machine without palo installed.
Signed-off-by: Kyle McMartin
-
parisc: Replace most arrays sized by NR_CPUS with percpu variables.
Signed-off-by: Helge Deller
Signed-off-by: Kyle McMartin -
trivial fixes:
- use KERN_WARNING for printk()
- use BUG_ON() instead of "if (xx) BUG();"Signed-off-by: Helge Deller
Signed-off-by: Kyle McMartin--
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html -
Shouldn't commit without building before morning coffee...
Signed-off-by: Kyle McMartin
-
Create a new __space_to_prot inline to convert the space id (mmu context)
to a protection id. Sadly it doesn't look like the #ifdef can be eliminated
since relying on the compiler to not truncate a bit on
return (ctx >> SPACEID_SHIFT) << 1;
seems a little dodgy.Signed-off-by: Kyle McMartin
-
Signed-off-by: Kyle McMartin
-
Since unwind_frame_init_from_blocked_task() may be called from
interrupt/in_atomic context, it needs to kmalloc() memory with
GFP_ATOMIC instead of GFP_KERNEL.This fixes this warning (ShowTasks called from sysrq handler):
BUG: sleeping function called from invalid context at mm/slab.c:3044
in_atomic(): 1, irqs_disabled(): 1, pid: 2119, name: miniruby
Backtrace:
[] __might_sleep+0x4c/0x118
[] kmem_cache_alloc+0x2c/0xb4
[] unwind_frame_init_from_blocked_task+0x30/0xa0
[] parisc_show_stack+0x3c/0xac
[] show_state_filter+0x80/0xd8
[] __handle_sysrq+0xd0/0x1b0
[] receive_chars+0x22c/0x318
[] serial8250_handle_port+0x40/0x88
[] serial8250_interrupt+0x104/0x10c
[] handle_IRQ_event+0x44/0x94
[] __do_IRQ+0x15c/0x1dc
[] superio_interrupt+0x74/0xa8
[] handle_IRQ_event+0x44/0x94
[] __do_IRQ+0x15c/0x1dc
[] do_cpu_irq_mask+0x90/0xbc
[] intr_return+0x0/0x4Signed-off-by: Helge Deller
Signed-off-by: Kyle McMartin -
The block layer dropped the virtual merge feature
(b8b3e16cfe6435d961f6aaebcfd52a1ff2a988c5). BIO_VMERGE_BOUNDARY and
BIO_VMERGE_MAX_SIZE definitions are meaningless now.Signed-off-by: FUJITA Tomonori
Acked-by: Grant Grundler
Signed-off-by: Kyle McMartin -
Signed-off-by: Harvey Harrison
Cc: Matthew Wilcox
Signed-off-by: Andrew Morton
Signed-off-by: Kyle McMartin -
Make the following needlessly global code static:
- iomap.c: struct iomap_ops[]
- memcpy.c: pa_memcpy()Signed-off-by: Adrian Bunk
Cc: Matthew Wilcox
Cc: Grant Grundler
Signed-off-by: Andrew Morton
Signed-off-by: Kyle McMartin
05 Jan, 2009
1 commit
-
On 32bit (and sometimes 64bit) and with big kernel modules like xfs or
ipv6 the relocation types R_PARISC_PCREL17F and R_PARISC_PCREL22F may
fail to reach their PLT stub if we only create one big stub array for
all sections at the beginning of the core or init section.With this patch we now instead add individual PLT stub entries
directly in front of the code sections where the stubs are actually
called. This reduces the distance between the PCREL location and the
stub entry so that the relocations can be fulfilled.While calculating the final layout of the kernel module in memory, the
kernel module loader calls arch_mod_section_prepend() to request the
to be reserved amount of memory in front of each individual section.Tested with 32- and 64bit kernels.
Signed-off-by: Helge Deller
Signed-off-by: Rusty Russell
04 Jan, 2009
1 commit
-
…/git/tip/linux-2.6-tip
* 'cpus4096-for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (77 commits)
x86: setup_per_cpu_areas() cleanup
cpumask: fix compile error when CONFIG_NR_CPUS is not defined
cpumask: use alloc_cpumask_var_node where appropriate
cpumask: convert shared_cpu_map in acpi_processor* structs to cpumask_var_t
x86: use cpumask_var_t in acpi/boot.c
x86: cleanup some remaining usages of NR_CPUS where s/b nr_cpu_ids
sched: put back some stack hog changes that were undone in kernel/sched.c
x86: enable cpus display of kernel_max and offlined cpus
ia64: cpumask fix for is_affinity_mask_valid()
cpumask: convert RCU implementations, fix
xtensa: define __fls
mn10300: define __fls
m32r: define __fls
h8300: define __fls
frv: define __fls
cris: define __fls
cpumask: CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
cpumask: zero extra bits in alloc_cpumask_var_node
cpumask: replace for_each_cpu_mask_nr with for_each_cpu in kernel/time/
cpumask: convert mm/
...
03 Jan, 2009
1 commit
-
…/git/tip/linux-2.6-tip
* 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (66 commits)
x86: export vector_used_by_percpu_irq
x86: use logical apicid in x2apic_cluster's x2apic_cpu_mask_to_apicid_and()
sched: nominate preferred wakeup cpu, fix
x86: fix lguest used_vectors breakage, -v2
x86: fix warning in arch/x86/kernel/io_apic.c
sched: fix warning in kernel/sched.c
sched: move test_sd_parent() to an SMP section of sched.h
sched: add SD_BALANCE_NEWIDLE at MC and CPU level for sched_mc>0
sched: activate active load balancing in new idle cpus
sched: bias task wakeups to preferred semi-idle packages
sched: nominate preferred wakeup cpu
sched: favour lower logical cpu number for sched_mc balance
sched: framework for sched_mc/smt_power_savings=N
sched: convert BALANCE_FOR_xx_POWER to inline functions
x86: use possible_cpus=NUM to extend the possible cpus allowed
x86: fix cpu_mask_to_apicid_and to include cpu_online_mask
x86: update io_apic.c to the new cpumask code
x86: Introduce topology_core_cpumask()/topology_thread_cpumask()
x86: xen: use smp_call_function_many()
x86: use work_on_cpu in x86/kernel/cpu/mcheck/mce_amd_64.c
...Fixed up trivial conflict in kernel/time/tick-sched.c manually
01 Jan, 2009
2 commits
-
This is defined in linux/cpumask.h (included in this file already),
and this is now defined differently.Signed-off-by: Rusty Russell
Cc: linux-parisc@vger.kernel.org -
Signed-off-by: Al Viro
30 Dec, 2008
1 commit
25 Dec, 2008
1 commit
24 Dec, 2008
1 commit
-
flush_tlb_mm's "optimized" uniprocessor case of allocating a new
context for userspace is exposing a race where we can suddely return
to a syscall with the protection id and space id out of sync, trapping
on the next userspace access.Debugged-by: James Bottomley
Tested-by: Helge Deller
Signed-off-by: Kyle McMartin
Signed-off-by: Linus Torvalds
13 Dec, 2008
2 commits
-
Impact: change existing irq_chip API
Not much point with gentle transition here: the struct irq_chip's
setaffinity method signature needs to change.Fortunately, not widely used code, but hits a few architectures.
Note: In irq_select_affinity() I save a temporary in by mangling
irq_desc[irq].affinity directly. Ingo, does this break anything?(Folded in fix from KOSAKI Motohiro)
Signed-off-by: Rusty Russell
Signed-off-by: Mike Travis
Reviewed-by: Grant Grundler
Acked-by: Ingo Molnar
Cc: ralf@linux-mips.org
Cc: grundler@parisc-linux.org
Cc: jeremy@xensource.com
Cc: KOSAKI Motohiro -
Impact: cleanup
Each SMP arch defines these themselves. Move them to a central
location.Twists:
1) Some archs (m32, parisc, s390) set possible_map to all 1, so we add a
CONFIG_INIT_ALL_POSSIBLE for this rather than break them.2) mips and sparc32 '#define cpu_possible_map phys_cpu_present_map'.
Those archs simply have phys_cpu_present_map replaced everywhere.3) Alpha defined cpu_possible_map to cpu_present_map; this is tricky
so I just manipulate them both in sync.4) IA64, cris and m32r have gratuitous 'extern cpumask_t cpu_possible_map'
declarations.Signed-off-by: Rusty Russell
Reviewed-by: Grant Grundler
Tested-by: Tony Luck
Acked-by: Ingo Molnar
Cc: Mike Travis
Cc: ink@jurassic.park.msu.ru
Cc: rmk@arm.linux.org.uk
Cc: starvik@axis.com
Cc: tony.luck@intel.com
Cc: takata@linux-m32r.org
Cc: ralf@linux-mips.org
Cc: grundler@parisc-linux.org
Cc: paulus@samba.org
Cc: schwidefsky@de.ibm.com
Cc: lethal@linux-sh.org
Cc: wli@holomorphy.com
Cc: davem@davemloft.net
Cc: jdike@addtoit.com
Cc: mingo@redhat.com
04 Dec, 2008
1 commit
-
Conflicts:
fs/nfsd/nfs4recover.cManually fixed above to use new creds API functions, e.g.
nfs4_save_creds().Signed-off-by: James Morris
01 Dec, 2008
1 commit
-
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
parisc: struct device - replace bus_id with dev_name(), dev_set_name()
parisc: fix kernel crash when unwinding a userspace process
parisc: __kernel_time_t is always long