Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  cpuidle: Single/Global registration of idle states
  cpuidle: Split cpuidle_state structure and move per-cpu statistics fields
  cpuidle: Remove CPUIDLE_FLAG_IGNORE and dev->prepare()
  cpuidle: Move dev->last_residency update to driver enter routine; remove dev->last_state
  ACPI: Fix CONFIG_ACPI_DOCK=n compiler warning
  ACPI: Export FADT pm_profile integer value to userspace
  thermal: Prevent polling from happening during system suspend
  ACPI: Drop ACPI_NO_HARDWARE_INIT
  ACPI atomicio: Convert width in bits to bytes in __acpi_ioremap_fast()
  PNPACPI: Simplify disabled resource registration
  ACPI: Fix possible recursive locking in hwregs.c
  ACPI: use kstrdup()
  mrst pmu: update comment
  tools/power turbostat: less verbose debugging

1 files changed, 15 insertions, 47 deletions

diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index bbf3edd85beb..5be4a392a3ae 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -509,15 +509,12 @@ static __init void pnpacpi_parse_dma_option(struct pnp_dev *dev,
                                             struct acpi_resource_dma *p)
 {
         int i;
-        unsigned char map = 0, flags = 0;
-
-        if (p->channel_count == 0)
-                flags |= IORESOURCE_DISABLED;
+        unsigned char map = 0, flags;
 
         for (i = 0; i < p->channel_count; i++)
                 map |= 1 << p->channels[i];
 
-        flags |= dma_flags(dev, p->type, p->bus_master, p->transfer);
+        flags = dma_flags(dev, p->type, p->bus_master, p->transfer);
         pnp_register_dma_resource(dev, option_flags, map, flags);
 }
 
@@ -527,17 +524,14 @@ static __init void pnpacpi_parse_irq_option(struct pnp_dev *dev,
 {
         int i;
         pnp_irq_mask_t map;
-        unsigned char flags = 0;
-
-        if (p->interrupt_count == 0)
-                flags |= IORESOURCE_DISABLED;
+        unsigned char flags;
 
         bitmap_zero(map.bits, PNP_IRQ_NR);
         for (i = 0; i < p->interrupt_count; i++)
                 if (p->interrupts[i])
                         __set_bit(p->interrupts[i], map.bits);
 
-        flags |= irq_flags(p->triggering, p->polarity, p->sharable);
+        flags = irq_flags(p->triggering, p->polarity, p->sharable);
         pnp_register_irq_resource(dev, option_flags, &map, flags);
 }
 
@@ -547,10 +541,7 @@ static __init void pnpacpi_parse_ext_irq_option(struct pnp_dev *dev,
 {
         int i;
         pnp_irq_mask_t map;
-        unsigned char flags = 0;
-
-        if (p->interrupt_count == 0)
-                flags |= IORESOURCE_DISABLED;
+        unsigned char flags;
 
         bitmap_zero(map.bits, PNP_IRQ_NR);
         for (i = 0; i < p->interrupt_count; i++) {
@@ -564,7 +555,7 @@ static __init void pnpacpi_parse_ext_irq_option(struct pnp_dev *dev,
                 }
         }
 
-        flags |= irq_flags(p->triggering, p->polarity, p->sharable);
+        flags = irq_flags(p->triggering, p->polarity, p->sharable);
         pnp_register_irq_resource(dev, option_flags, &map, flags);
 }
 
@@ -574,11 +565,8 @@ static __init void pnpacpi_parse_port_option(struct pnp_dev *dev,
 {
         unsigned char flags = 0;
 
-        if (io->address_length == 0)
-                flags |= IORESOURCE_DISABLED;
-
         if (io->io_decode == ACPI_DECODE_16)
-                flags |= IORESOURCE_IO_16BIT_ADDR;
+                flags = IORESOURCE_IO_16BIT_ADDR;
         pnp_register_port_resource(dev, option_flags, io->minimum, io->maximum,
                                    io->alignment, io->address_length, flags);
 }
@@ -587,13 +575,8 @@ static __init void pnpacpi_parse_fixed_port_option(struct pnp_dev *dev,
                                         unsigned int option_flags,
                                         struct acpi_resource_fixed_io *io)
 {
-        unsigned char flags = 0;
-
-        if (io->address_length == 0)
-                flags |= IORESOURCE_DISABLED;
-
         pnp_register_port_resource(dev, option_flags, io->address, io->address,
-                                   0, io->address_length, flags | IORESOURCE_IO_FIXED);
+                                   0, io->address_length, IORESOURCE_IO_FIXED);
 }
 
 static __init void pnpacpi_parse_mem24_option(struct pnp_dev *dev,
@@ -602,11 +585,8 @@ static __init void pnpacpi_parse_mem24_option(struct pnp_dev *dev,
 {
         unsigned char flags = 0;
 
-        if (p->address_length == 0)
-                flags |= IORESOURCE_DISABLED;
-
         if (p->write_protect == ACPI_READ_WRITE_MEMORY)
-                flags |= IORESOURCE_MEM_WRITEABLE;
+                flags = IORESOURCE_MEM_WRITEABLE;
         pnp_register_mem_resource(dev, option_flags, p->minimum, p->maximum,
                                   p->alignment, p->address_length, flags);
 }
@@ -617,11 +597,8 @@ static __init void pnpacpi_parse_mem32_option(struct pnp_dev *dev,
 {
         unsigned char flags = 0;
 
-        if (p->address_length == 0)
-                flags |= IORESOURCE_DISABLED;
-
         if (p->write_protect == ACPI_READ_WRITE_MEMORY)
-                flags |= IORESOURCE_MEM_WRITEABLE;
+                flags = IORESOURCE_MEM_WRITEABLE;
         pnp_register_mem_resource(dev, option_flags, p->minimum, p->maximum,
                                   p->alignment, p->address_length, flags);
 }
@@ -632,11 +609,8 @@ static __init void pnpacpi_parse_fixed_mem32_option(struct pnp_dev *dev,
 {
         unsigned char flags = 0;
 
-        if (p->address_length == 0)
-                flags |= IORESOURCE_DISABLED;
-
         if (p->write_protect == ACPI_READ_WRITE_MEMORY)
-                flags |= IORESOURCE_MEM_WRITEABLE;
+                flags = IORESOURCE_MEM_WRITEABLE;
         pnp_register_mem_resource(dev, option_flags, p->address, p->address,
                                   0, p->address_length, flags);
 }
@@ -656,19 +630,16 @@ static __init void pnpacpi_parse_address_option(struct pnp_dev *dev,
                 return;
         }
 
-        if (p->address_length == 0)
-                flags |= IORESOURCE_DISABLED;
-
         if (p->resource_type == ACPI_MEMORY_RANGE) {
                 if (p->info.mem.write_protect == ACPI_READ_WRITE_MEMORY)
-                        flags |= IORESOURCE_MEM_WRITEABLE;
+                        flags = IORESOURCE_MEM_WRITEABLE;
                 pnp_register_mem_resource(dev, option_flags, p->minimum,
                                           p->minimum, 0, p->address_length,
                                           flags);
         } else if (p->resource_type == ACPI_IO_RANGE)
                 pnp_register_port_resource(dev, option_flags, p->minimum,
                                            p->minimum, 0, p->address_length,
-                                           flags | IORESOURCE_IO_FIXED);
+                                           IORESOURCE_IO_FIXED);
 }
 
 static __init void pnpacpi_parse_ext_address_option(struct pnp_dev *dev,
@@ -678,19 +649,16 @@ static __init void pnpacpi_parse_ext_address_option(struct pnp_dev *dev,
         struct acpi_resource_extended_address64 *p = &r->data.ext_address64;
         unsigned char flags = 0;
 
-        if (p->address_length == 0)
-                flags |= IORESOURCE_DISABLED;
-
         if (p->resource_type == ACPI_MEMORY_RANGE) {
                 if (p->info.mem.write_protect == ACPI_READ_WRITE_MEMORY)
-                        flags |= IORESOURCE_MEM_WRITEABLE;
+                        flags = IORESOURCE_MEM_WRITEABLE;
                 pnp_register_mem_resource(dev, option_flags, p->minimum,
                                           p->minimum, 0, p->address_length,
                                           flags);
         } else if (p->resource_type == ACPI_IO_RANGE)
                 pnp_register_port_resource(dev, option_flags, p->minimum,
                                            p->minimum, 0, p->address_length,
-                                           flags | IORESOURCE_IO_FIXED);
+                                           IORESOURCE_IO_FIXED);
 }
 
 struct acpipnp_parse_option_s {