Commit 36377f61 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds

[PATCH] Fix hw_random build on ia64

The following patch allows hw_random.c to build on ia64.  (The problem
was just that the VIA stuff has i386 assembly in it.  The current code
only probes for VIA on i386 anyway, so this patch just adds more ifdefs
so the VIA code is only built for i386.)
parent d5b1f484
...@@ -92,10 +92,12 @@ static void amd_cleanup(void); ...@@ -92,10 +92,12 @@ static void amd_cleanup(void);
static unsigned int amd_data_present (void); static unsigned int amd_data_present (void);
static u32 amd_data_read (void); static u32 amd_data_read (void);
#ifdef __i386__
static int __init via_init(struct pci_dev *dev); static int __init via_init(struct pci_dev *dev);
static void via_cleanup(void); static void via_cleanup(void);
static unsigned int via_data_present (void); static unsigned int via_data_present (void);
static u32 via_data_read (void); static u32 via_data_read (void);
#endif
struct rng_operations { struct rng_operations {
int (*init) (struct pci_dev *dev); int (*init) (struct pci_dev *dev);
...@@ -137,8 +139,10 @@ static struct rng_operations rng_vendor_ops[] = { ...@@ -137,8 +139,10 @@ static struct rng_operations rng_vendor_ops[] = {
/* rng_hw_amd */ /* rng_hw_amd */
{ amd_init, amd_cleanup, amd_data_present, amd_data_read, 4 }, { amd_init, amd_cleanup, amd_data_present, amd_data_read, 4 },
#ifdef __i386__
/* rng_hw_via */ /* rng_hw_via */
{ via_init, via_cleanup, via_data_present, via_data_read, 1 }, { via_init, via_cleanup, via_data_present, via_data_read, 1 },
#endif
}; };
/* /*
...@@ -341,6 +345,7 @@ static void amd_cleanup(void) ...@@ -341,6 +345,7 @@ static void amd_cleanup(void)
/* FIXME: twiddle pmio, also? */ /* FIXME: twiddle pmio, also? */
} }
#ifdef __i386__
/*********************************************************************** /***********************************************************************
* *
* VIA RNG operations * VIA RNG operations
...@@ -456,6 +461,7 @@ static void via_cleanup(void) ...@@ -456,6 +461,7 @@ static void via_cleanup(void)
{ {
/* do nothing */ /* do nothing */
} }
#endif
/*********************************************************************** /***********************************************************************
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment