diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 18:46:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 18:46:37 -0400 |
| commit | 39059cceeda478cd040d521b9541d1113035c908 (patch) | |
| tree | 56adf04d6766a4346160aacd709468e5b2f1b879 /drivers/char | |
| parent | b01b7dc2832a1a286ae84ffa3e940ce9f8e352c2 (diff) | |
| parent | c2cdf6aba0dfcfb54be646ab630c1bccd180e890 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/macio: Fix probing of macio devices by using the right of match table
agp/uninorth: Fix oops caused by flushing too much
powerpc/pasemi: Update MAINTAINERS file
powerpc/cell: Fix integer constant warning
powerpc/kprobes: Remove resume_execution() in kprobes
powerpc/macio: Don't dereference pointer before null check
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/agp/uninorth-agp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c index 95db71360d24..f845a8f718b3 100644 --- a/drivers/char/agp/uninorth-agp.c +++ b/drivers/char/agp/uninorth-agp.c | |||
| @@ -415,7 +415,7 @@ static int uninorth_create_gatt_table(struct agp_bridge_data *bridge) | |||
| 415 | bridge->gatt_table_real = (u32 *) table; | 415 | bridge->gatt_table_real = (u32 *) table; |
| 416 | /* Need to clear out any dirty data still sitting in caches */ | 416 | /* Need to clear out any dirty data still sitting in caches */ |
| 417 | flush_dcache_range((unsigned long)table, | 417 | flush_dcache_range((unsigned long)table, |
| 418 | (unsigned long)(table_end + PAGE_SIZE)); | 418 | (unsigned long)table_end + 1); |
| 419 | bridge->gatt_table = vmap(pages, (1 << page_order), 0, PAGE_KERNEL_NCG); | 419 | bridge->gatt_table = vmap(pages, (1 << page_order), 0, PAGE_KERNEL_NCG); |
| 420 | 420 | ||
| 421 | if (bridge->gatt_table == NULL) | 421 | if (bridge->gatt_table == NULL) |