diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-15 18:55:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-15 18:56:13 +0200 |
| commit | fa08661af834875c9bd6f7f0b1b9388dc72a6585 (patch) | |
| tree | c381fcfcfeb38515bfa93445c80ad9231343414d /arch/arm/plat-pxa/gpio.c | |
| parent | rcu: Add synchronize_sched_expedited() rcutorture doc + updates (diff) | |
| parent | Linux 2.6.31-rc6 (diff) | |
| download | linux-fa08661af834875c9bd6f7f0b1b9388dc72a6585.tar.xz linux-fa08661af834875c9bd6f7f0b1b9388dc72a6585.zip | |
Merge commit 'v2.6.31-rc6' into core/rcu
Merge reason: the branch was on pre-rc1 .30, update to latest.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/plat-pxa/gpio.c')
| -rw-r--r-- | arch/arm/plat-pxa/gpio.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/plat-pxa/gpio.c b/arch/arm/plat-pxa/gpio.c index abc79d44acaa..98548c6903a0 100644 --- a/arch/arm/plat-pxa/gpio.c +++ b/arch/arm/plat-pxa/gpio.c @@ -16,7 +16,7 @@ #include <linux/irq.h> #include <linux/io.h> #include <linux/sysdev.h> -#include <linux/bootmem.h> +#include <linux/slab.h> #include <mach/gpio.h> @@ -112,17 +112,12 @@ static int __init pxa_init_gpio_chip(int gpio_end) int i, gpio, nbanks = gpio_to_bank(gpio_end) + 1; struct pxa_gpio_chip *chips; - /* this is early, we have to use bootmem allocator, and we really - * want this to be allocated dynamically for different 'gpio_end' - */ - chips = alloc_bootmem_low(nbanks * sizeof(struct pxa_gpio_chip)); + chips = kzalloc(nbanks * sizeof(struct pxa_gpio_chip), GFP_KERNEL); if (chips == NULL) { pr_err("%s: failed to allocate GPIO chips\n", __func__); return -ENOMEM; } - memset(chips, 0, nbanks * sizeof(struct pxa_gpio_chip)); - for (i = 0, gpio = 0; i < nbanks; i++, gpio += 32) { struct gpio_chip *c = &chips[i].chip; |