Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 6 insertions, 10 deletions

diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 70a770ac0138..9ded667625ac 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -31,6 +31,7 @@
 #include <linux/seq_file.h>
 #include <linux/bitops.h>
 #include <linux/clocksource.h>
+#include <linux/slab.h>
 
 #include <asm/current.h>
 #include <asm/uaccess.h>
@@ -215,9 +216,7 @@ static void hpet_timer_set_irq(struct hpet_dev *devp)
         else
                 v &= ~0xffff;
 
-        for (irq = find_first_bit(&v, HPET_MAX_IRQ); irq < HPET_MAX_IRQ;
-                irq = find_next_bit(&v, HPET_MAX_IRQ, 1 + irq)) {
-
+        for_each_set_bit(irq, &v, HPET_MAX_IRQ) {
                 if (irq >= nr_irqs) {
                         irq = HPET_MAX_IRQ;
                         break;
@@ -675,36 +674,33 @@ static int hpet_is_known(struct hpet_data *hdp)
 
 static ctl_table hpet_table[] = {
         {
-         .ctl_name = CTL_UNNUMBERED,
          .procname = "max-user-freq",
          .data = &hpet_max_freq,
          .maxlen = sizeof(int),
          .mode = 0644,
-         .proc_handler = &proc_dointvec,
+         .proc_handler = proc_dointvec,
          },
-        {.ctl_name = 0}
+        {}
 };
 
 static ctl_table hpet_root[] = {
         {
-         .ctl_name = CTL_UNNUMBERED,
          .procname = "hpet",
          .maxlen = 0,
          .mode = 0555,
          .child = hpet_table,
          },
-        {.ctl_name = 0}
+        {}
 };
 
 static ctl_table dev_root[] = {
         {
-         .ctl_name = CTL_DEV,
          .procname = "dev",
          .maxlen = 0,
          .mode = 0555,
          .child = hpet_root,
          },
-        {.ctl_name = 0}
+        {}
 };
 
 static struct ctl_table_header *sysctl_header;