Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7c4e95bf483231d55bc0d491bc585bb9b7e852b8
Commit:     7c4e95bf483231d55bc0d491bc585bb9b7e852b8
Parent:     9b3af29bf33bfe08c604769632799d27d56ae103
Author:     Klaus Kudielka <[EMAIL PROTECTED]>
AuthorDate: Tue May 8 00:26:25 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue May 8 11:15:03 2007 -0700

    fix cyclades.h for x86_64 (and probably others)
    
    At least on x86_64 the present cyclades.h is broken due to the wrong size
    of uclong.  This affects, of course, both the kernel and the user-level
    utilities.  The symptom is that cyzload refuses to load the firmware.  I
    also managed to freeze the machine when unloading the module.
    
    The patch below fixes this in an architecture-independent way.  I have
    tested it with 2.6.19 and the driver works fine again with a Cyclades-Z on
    an Athlon 64 X2.
    
    [EMAIL PROTECTED]: fix warnings]
    
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/char/cyclades.c  |    2 +-
 include/linux/cyclades.h |   14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index 16dc5d1..7f73bff 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -1533,7 +1533,7 @@ cyz_issue_cmd(struct cyclades_card *cinfo,
        struct FIRM_ID __iomem *firm_id;
        struct ZFW_CTRL __iomem *zfw_ctrl;
        struct BOARD_CTRL __iomem *board_ctrl;
-       unsigned long __iomem *pci_doorbell;
+       uclong __iomem *pci_doorbell;
        int index;
 
        firm_id = cinfo->base_addr + ID_ADDRESS;
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h
index 46d8254..a6865f0 100644
--- a/include/linux/cyclades.h
+++ b/include/linux/cyclades.h
@@ -149,14 +149,12 @@ struct CYZ_BOOT_CTRL {
  *     architectures and compilers.
  */
 
-#if defined(__alpha__)
-typedef unsigned long  ucdouble;       /* 64 bits, unsigned */
-typedef unsigned int   uclong;         /* 32 bits, unsigned */
-#else
-typedef unsigned long  uclong;         /* 32 bits, unsigned */
-#endif
-typedef unsigned short ucshort;        /* 16 bits, unsigned */
-typedef unsigned char  ucchar;         /* 8 bits, unsigned */
+#include <asm/types.h>
+
+typedef __u64  ucdouble;               /* 64 bits, unsigned */
+typedef __u32  uclong;                 /* 32 bits, unsigned */
+typedef __u16  ucshort;                /* 16 bits, unsigned */
+typedef __u8   ucchar;                 /* 8 bits, unsigned */
 
 /*
  *     Memory Window Sizes
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to