diff options
author | Jack Steiner <steiner@sgi.com> | 2009-04-02 19:59:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-02 22:05:07 -0400 |
commit | 27ca8a7b2bdfb3e22e67fbd5df58e6b6f0bbcd48 (patch) | |
tree | c7fbe657ba4d31b1977b7247dd7626414246a1c3 /drivers/misc/sgi-gru/grufile.c | |
parent | e1c3219d06447dab8a87b96df1211d158e21071e (diff) |
sgi-gru: fix bugs related to module unload of the GRU driver
Fix bugs related to module unload of the GRU driver.
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/misc/sgi-gru/grufile.c')
-rw-r--r-- | drivers/misc/sgi-gru/grufile.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c index b7a21ce91496..3e6e42d2f01b 100644 --- a/drivers/misc/sgi-gru/grufile.c +++ b/drivers/misc/sgi-gru/grufile.c | |||
@@ -440,7 +440,7 @@ exit1: | |||
440 | 440 | ||
441 | static void __exit gru_exit(void) | 441 | static void __exit gru_exit(void) |
442 | { | 442 | { |
443 | int i, bid; | 443 | int i, bid, gid; |
444 | int order = get_order(sizeof(struct gru_state) * | 444 | int order = get_order(sizeof(struct gru_state) * |
445 | GRU_CHIPLETS_PER_BLADE); | 445 | GRU_CHIPLETS_PER_BLADE); |
446 | 446 | ||
@@ -450,6 +450,9 @@ static void __exit gru_exit(void) | |||
450 | for (i = 0; i < GRU_CHIPLETS_PER_BLADE; i++) | 450 | for (i = 0; i < GRU_CHIPLETS_PER_BLADE; i++) |
451 | free_irq(IRQ_GRU + i, NULL); | 451 | free_irq(IRQ_GRU + i, NULL); |
452 | 452 | ||
453 | foreach_gid(gid) | ||
454 | gru_kservices_exit(GID_TO_GRU(gid)); | ||
455 | |||
453 | for (bid = 0; bid < GRU_MAX_BLADES; bid++) | 456 | for (bid = 0; bid < GRU_MAX_BLADES; bid++) |
454 | free_pages((unsigned long)gru_base[bid], order); | 457 | free_pages((unsigned long)gru_base[bid], order); |
455 | 458 | ||