Merge commit 'v2.6.27-rc1' into x86/core

Conflicts:

	include/asm-x86/dma-mapping.h
	include/asm-x86/namei.h
	include/asm-x86/uaccess.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 5 insertions, 10 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 964964baefa2..3cd441ebf5d2 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -28,8 +28,7 @@ void dynamic_irq_init(unsigned int irq)
         unsigned long flags;
 
         if (irq >= NR_IRQS) {
-                printk(KERN_ERR "Trying to initialize invalid IRQ%d\n", irq);
-                WARN_ON(1);
+                WARN(1, KERN_ERR "Trying to initialize invalid IRQ%d\n", irq);
                 return;
         }
 
@@ -62,8 +61,7 @@ void dynamic_irq_cleanup(unsigned int irq)
         unsigned long flags;
 
         if (irq >= NR_IRQS) {
-                printk(KERN_ERR "Trying to cleanup invalid IRQ%d\n", irq);
-                WARN_ON(1);
+                WARN(1, KERN_ERR "Trying to cleanup invalid IRQ%d\n", irq);
                 return;
         }
 
@@ -71,9 +69,8 @@ void dynamic_irq_cleanup(unsigned int irq)
         spin_lock_irqsave(&desc->lock, flags);
         if (desc->action) {
                 spin_unlock_irqrestore(&desc->lock, flags);
-                printk(KERN_ERR "Destroying IRQ%d without calling free_irq\n",
+                WARN(1, KERN_ERR "Destroying IRQ%d without calling free_irq\n",
                         irq);
-                WARN_ON(1);
                 return;
         }
         desc->msi_desc = NULL;
@@ -96,8 +93,7 @@ int set_irq_chip(unsigned int irq, struct irq_chip *chip)
         unsigned long flags;
 
         if (irq >= NR_IRQS) {
-                printk(KERN_ERR "Trying to install chip for IRQ%d\n", irq);
-                WARN_ON(1);
+                WARN(1, KERN_ERR "Trying to install chip for IRQ%d\n", irq);
                 return -EINVAL;
         }
 
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 7d73e008fc3b..22d10d3189f8 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -184,8 +184,7 @@ static void __enable_irq(struct irq_desc *desc, unsigned int irq)
 {
         switch (desc->depth) {
         case 0:
-                printk(KERN_WARNING "Unbalanced enable for IRQ %d\n", irq);
-                WARN_ON(1);
+                WARN(1, KERN_WARNING "Unbalanced enable for IRQ %d\n", irq);
                 break;
         case 1: {
                 unsigned int status = desc->status & ~IRQ_DISABLED;