[ARM] General cleanups/missed bits in previous csets

This corrects spelling mistakes, adds missed configuration for
cpufreq, corrects free_irq comment, etc.

diff --git a/arch/arm/config.in b/arch/arm/config.in
index 1aae024f83f0b330bab9ce9cfac7b98bec11229a..635874b18bfc2aee98caed4bf12e3fc27d3e560c 100644 (file)
--- a/arch/arm/config.in
+++ b/arch/arm/config.in
@@ -335,6 +335,16 @@ hex 'Compressed ROM boot loader BSS address' CONFIG_ZBOOT_ROM_BSS 0
 if [ "$CONFIG_ARCH_SA1100" = "y" -o \
      "$CONFIG_ARCH_INTEGRATOR" = "y" ]; then
    dep_bool 'Support CPU clock change (EXPERIMENTAL)' CONFIG_CPU_FREQ $CONFIG_EXPERIMENTAL
+else
+   define_bool CONFIG_CPU_FREQ n
+fi
+
+if [ "$CONFIG_CPU_FREQ" = "y" ]; then
+   define_bool CONFIG_CPU_FREQ_24_API y
+   define_bool CONFIG_CPU_FREQ_26_API y
+else
+   define_bool CONFIG_CPU_FREQ_24_API n
+   define_bool CONFIG_CPU_FREQ_26_API n
 fi
 
 source drivers/pci/Config.in

diff --git a/arch/arm/kernel/compat.c b/arch/arm/kernel/compat.c
index 8fd9632d0c08cf601abb295de53dd949d741df32..7195add42e74cab407e4478743993246b04a62ee 100644 (file)
--- a/arch/arm/kernel/compat.c
+++ b/arch/arm/kernel/compat.c
@@ -95,13 +95,14 @@ static void __init build_tag_list(struct param_struct *params, void *taglist)
 {
        struct tag *tag = taglist;
 
-       printk(KERN_DEBUG "Converting old-style param struct to taglist\n");
-
        if (params->u1.s.page_size != PAGE_SIZE) {
                printk(KERN_WARNING "Warning: bad configuration page, "
                       "trying to continue\n");
                return;
        }
+
+       printk(KERN_DEBUG "Converting old-style param struct to taglist\n");
+
 #ifdef CONFIG_ARCH_NETWINDER
        if (params->u1.s.nr_pages != 0x02000 &&
            params->u1.s.nr_pages != 0x04000 &&

diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index 73a253c6fe6ec10a156e5c16d24857ae087ab978..399d81bf412a36fa6b2a7d743d7c09e77104cc8f 100644 (file)
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -569,7 +569,7 @@ int request_irq(unsigned int irq, void (*handler)(int, void *, struct pt_regs *)
  *     On a shared IRQ the caller must ensure the interrupt is disabled
  *     on the card it drives before calling this function.
  *
- *     This function may be called from interrupt context.
+ *     This function must not be called from interrupt context.
  */
 void free_irq(unsigned int irq, void *dev_id)
 {
@@ -591,15 +591,19 @@ void free_irq(unsigned int irq, void *dev_id)
 
                /* Found it - now free it */
                *p = action->next;
-               kfree(action);
-               goto out;
+               break;
        }
-       printk(KERN_ERR "Trying to free free IRQ%d\n",irq);
+       spin_unlock_irqrestore(&irq_controller_lock, flags);
+
+       if (!action) {
+               printk(KERN_ERR "Trying to free free IRQ%d\n",irq);
 #ifdef CONFIG_DEBUG_ERRORS
-       __backtrace();
+               __backtrace();
 #endif
-out:
-       spin_unlock_irqrestore(&irq_controller_lock, flags);
+       } else {
+               synchronize_irq(irq);
+               kfree(action);
+       }
 }
 
 /* Start the interrupt probing.  Unlike other architectures,

diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c
index 01368f31c8ceaa2f95defd6c612c89676d96b2f3..76e0da5b973efa6c6f166efddd1ff01363dc9591 100644 (file)
--- a/arch/arm/mach-sa1100/pm.c
+++ b/arch/arm/mach-sa1100/pm.c
@@ -30,6 +30,7 @@
 #include <linux/interrupt.h>
 #include <linux/sysctl.h>
 #include <linux/errno.h>
+#include <linux/device.h>
 #include <linux/cpufreq.h>
 
 #include <asm/hardware.h>

diff --git a/arch/arm/mm/fault-common.c b/arch/arm/mm/fault-common.c
index 2feafb6d40dc60d8038f09bf650c672398486eb4..4099f44532b94d9ae2605859e25869124963bfc1 100644 (file)
--- a/arch/arm/mm/fault-common.c
+++ b/arch/arm/mm/fault-common.c
@@ -35,7 +35,7 @@
 #else
 /*
  * "code" is actually the FSR register.  Bit 11 set means the
- * isntruction was performing a write.
+ * instruction was performing a write.
  */
 #define DO_COW(code)           ((code) & (1 << 11))
 #define READ_FAULT(code)       (!DO_COW(code))
@@ -54,7 +54,7 @@ void show_pte(struct mm_struct *mm, unsigned long addr)
 
        printk(KERN_ALERT "pgd = %p\n", mm->pgd);
        pgd = pgd_offset(mm, addr);
-       printk(KERN_ALERT "*pgd=%08lx", pgd_val(*pgd));
+       printk(KERN_ALERT "[%08lx] *pgd=%08lx", addr, pgd_val(*pgd));
 
        do {
                pmd_t *pmd;

diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 39e28f1969189a38d1efbfe67393b22a66286498..9b8c9551fb87c923ddd6027cd3832cf7fc7b3d09 100644 (file)
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -6,7 +6,7 @@
 # To add an entry into this database, please see Documentation/arm/README,
 # or contact rmk@arm.linux.org.uk
 #
-# Last update: Sat Jul 27 09:56:53 2002
+# Last update: Sat Sep 21 13:39:13 2002
 #
 # machine_is_xxx       CONFIG_xxxx             MACH_TYPE_xxx           number
 #
@@ -214,3 +214,31 @@ emailphone         SA1100_EMAILPHONE       EMAILPHONE              202
 h3900                  ARCH_H3900              H3900                   203
 pxa1                   ARCH_PXA1               PXA1                    204
 koan369                        SA1100_KOAN369          KOAN369                 205
+cogent                 ARCH_COGENT             COGENT                  206
+esl_simputer           ARCH_ESL_SIMPUTER       ESL_SIMPUTER            207
+esl_simputer_clr       ARCH_ESL_SIMPUTER_CLR   ESL_SIMPUTER_CLR        208
+esl_simputer_bw                ARCH_ESL_SIMPUTER_BW    ESL_SIMPUTER_BW         209
+hhp_cradle             ARCH_HHP_CRADLE         HHP_CRADLE              210
+he500                  ARCH_HE500              HE500                   211
+inhandelf2             SA1100_INHANDELF2       INHANDELF2              212
+inhandftip             SA1100_INHANDFTIP       INHANDFTIP              213
+dnp1110                        SA1100_DNP1110          DNP1110                 214
+pnp1110                        SA1100_PNP1110          PNP1110                 215
+csb226                 ARCH_CSB226             CSB226                  216
+arnold                 SA1100_ARNOLD           ARNOLD                  217
+psiboard               SA1100_PSIBOARD         PSIBOARD                218
+jz8028                 ARCH_JZ8028             JZ8028                  219
+ipaq3                  ARCH_IPAQ3              IPAQ3                   220
+forte                  SA1100_FORTE            FORTE                   221
+acam                   SA1100_ACAM             ACAM                    222
+abox                   SA1100_ABOX             ABOX                    223
+atmel                  ARCH_ATMEL              ATMEL                   224
+sitsang                        ARCH_SITSANG            SITSANG                 225
+cpu1110lcdnet          SA1100_CPU1110LCDNET    CPU1110LCDNET           226
+mpl_vcma9              ARCH_MPL_VCMA9          MPL_VCMA9               227
+opus_a1                        ARCH_OPUS_A1            OPUS_A1                 228
+daytona                        ARCH_DAYTONA            DAYTONA                 229
+killbear               SA1100_KILLBEAR         KILLBEAR                230
+yoho                   ARCH_YOHO               YOHO                    231
+jasper                 ARCH_JASPER             JASPER                  232
+dsc25                  ARCH_DSC25              DSC25                   233

diff --git a/include/asm-arm/pci.h b/include/asm-arm/pci.h
index 70fcb5c4d021e0309a954d6c722c42936b4c215d..3a7310558dd2a7957ff9c728b3e858973c1816a9 100644 (file)
--- a/include/asm-arm/pci.h
+++ b/include/asm-arm/pci.h
@@ -27,15 +27,11 @@ void sa1111_dma_sync_sg(struct pci_dev *, struct scatterlist *, int, int);
 #ifdef CONFIG_SA1111
 
 #define SA1111_FAKE_PCIDEV ((struct pci_dev *) 1111)
-
-static inline int dev_is_sa1111(const struct pci_dev *dev)
-{
-       return (dev == SA1111_FAKE_PCIDEV);
-}
+#define dev_is_sa1111(dev) (dev == SA1111_FAKE_PCIDEV)
 
 #else
 
-static inline int dev_is_sa1111(const struct pci_dev *dev) { return 0; }
+#define dev_is_sa1111(dev) (0)
 
 #endif