litmus-rt.git/arch/ia64/sn, branch wip-nested-locking The LITMUS^RT kernel. Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource 2011-05-14T10:06:36+00:00 Thomas Gleixner tglx@linutronix.de 2011-05-14T10:06:36+00:00 a18f22a968de17b29f2310cdb7ba69163e65ec15 Conflicts: arch/ia64/kernel/cyclone.c arch/mips/kernel/i8253.c arch/x86/kernel/i8253.c Reason: Resolve conflicts so further cleanups do not conflict further Signed-off-by: Thomas Gleixner <tglx@linutronix.de> 
Conflicts:
	arch/ia64/kernel/cyclone.c
	arch/mips/kernel/i8253.c
	arch/x86/kernel/i8253.c

Reason: Resolve conflicts so further cleanups do not conflict further

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6 2011-04-07T18:14:49+00:00 Linus Torvalds torvalds@linux-foundation.org 2011-04-07T18:14:49+00:00 42933bac11e811f02200c944d8562a15f8ec4ff0 * 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6: Fix common misspellings 
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
  Fix common misspellings
[IA64] fix build warning: argument 1 of 'irqd_irq_disabled' 2011-04-01T17:56:03+00:00 Tony Luck tony.luck@intel.com 2011-04-01T17:56:03+00:00 4275f4c8f7589bcac55d880529f58dac39815c95 In commit f5e5bf088bd3d30990efb7429aaf9f1e5134ffd6 ia64: Use irqd_irq_disabled() instead of desc->status access Thomas forgot to convert from irq to *irq_data. Add a call to irq_get_irq_data() to fix that. Signed-off-by: Tony Luck <tony.luck@intel.com> 
In commit f5e5bf088bd3d30990efb7429aaf9f1e5134ffd6
  ia64: Use irqd_irq_disabled() instead of desc->status access

Thomas forgot to convert from irq to *irq_data.

Add a call to irq_get_irq_data() to fix that.

Signed-off-by: Tony Luck <tony.luck@intel.com>
Fix common misspellings 2011-03-31T14:26:23+00:00 Lucas De Marchi lucas.demarchi@profusion.mobi 2011-03-31T01:57:33+00:00 25985edcedea6396277003854657b5f3cb31a628 Fixes generated by 'codespell' and manually reviewed. Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi> 
Fixes generated by 'codespell' and manually reviewed.

Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
[IA64] Fix build breakage - sn_force_interrupt_flag: undefined 2011-03-30T00:22:23+00:00 Tony Luck tony.luck@intel.com 2011-03-30T00:22:23+00:00 5e42d10adcf717e0cf10ae5da4998d5b74889db0 Latest irq changes removed the need for this forcing flag, and the definition - but missed the code that allowed it to be tweaked via /proc. Delete accessor functions too. Signed-off-by: Tony Luck <tony.luck@intel.com> 
Latest irq changes removed the need for this forcing flag, and the
definition - but missed the code that allowed it to be tweaked via
/proc.  Delete accessor functions too.

Signed-off-by: Tony Luck <tony.luck@intel.com>
ia64: Convert to the new irq_* function names 2011-03-29T12:48:05+00:00 Thomas Gleixner tglx@linutronix.de 2011-03-25T20:06:09+00:00 53c909c96ade613b5b485fadf7c3b833b3fd0bc7 Scripted with coccinelle. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> 
Scripted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
ia64: Use irqd_irq_disabled() instead of desc->status access 2011-03-29T12:48:04+00:00 Thomas Gleixner tglx@linutronix.de 2011-03-25T19:50:49+00:00 f5e5bf088bd3d30990efb7429aaf9f1e5134ffd6 Remove the last open coded access to irq_desc. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> 
Remove the last open coded access to irq_desc.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
ia64: sn: Use irqd_mark_affinity_set() helper 2011-03-29T12:48:04+00:00 Thomas Gleixner tglx@linutronix.de 2011-03-25T19:43:34+00:00 33776b009a45c8e921c47ea2d8304104677ee778 irq_desc->status is going to be restricted. Provide a helper to set that information in irq_data, where it belongs. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> 
irq_desc->status is going to be restricted. Provide a helper to set
that information in irq_data, where it belongs.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
ia64: sn: Use irq_move_irq() 2011-03-29T12:48:04+00:00 Thomas Gleixner tglx@linutronix.de 2011-03-25T19:35:17+00:00 b5f0149626ebca4e5f8dd465d335d1b05f28608b This replaces the old move_native_irq() function which is going away. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> 
This replaces the old move_native_irq() function which is going away.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
ia64: Use accessor functions all over the place 2011-03-29T12:48:03+00:00 Thomas Gleixner tglx@linutronix.de 2011-03-24T15:44:38+00:00 a2178334e9e7bb0fc11c9706114b43dbdd612ce4 Use the proper accessor functions instead of open coded irq_desc access. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> 
Use the proper accessor functions instead of open coded irq_desc access.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>