diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 10:48:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 10:48:16 -0700 |
| commit | 51e8703bdf12e2481b205096c973a3ab6a8ca18b (patch) | |
| tree | ed6b4131b8a613e9492488fb2b31d16bc9991ce1 /arch/microblaze/mm | |
| parent | 1fd06bb1571e2618ae392e2484925bf0dadd7857 (diff) | |
| parent | 0b9b0200b0922c29dc251b99700f96dade92214a (diff) | |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze: (33 commits)
microblaze: Do not copy reset vectors/manual reset vector setup
microblaze: Fix _reset function
microblaze: Fix microblaze init vectors
microblaze: Fix circular headers dependency when ftrace is enabled.
microblaze: Fix typo in Kconfig
microblaze: Add missing export symbols for lib functions
microblaze: Fix /dev/zero corruption from __clear_user()
microblaze: Convert irq_chip to new functions
microblaze: Select GENERIC_HARDIRQS_NO_DEPRECATED
microblaze: Remove stale irq_chip.end
microblaze: Fix sparse warnings - signal.c
microblaze: Fix sparse warning - fault.c
microblaze: Fix missing microblaze specific syscalls declaration
microblaze: Fix sparse warnings - cache.c
microblaze: Fix sparse warning - cpuinfo.h
microblaze: Fix sparse warning - unwind.c
microblaze: Fix sparse warning - consistent_alloc function
microblaze: Fix sparse warnings - ptrace
microblaze: Fix sparse warning - sw_exceptions
microblaze: Fix sparse warning - timer.c
...
Diffstat (limited to 'arch/microblaze/mm')
| -rw-r--r-- | arch/microblaze/mm/consistent.c | 2 | ||||
| -rw-r--r-- | arch/microblaze/mm/fault.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/microblaze/mm/consistent.c b/arch/microblaze/mm/consistent.c index 5a59dad62bd..a1e2e18e096 100644 --- a/arch/microblaze/mm/consistent.c +++ b/arch/microblaze/mm/consistent.c @@ -59,7 +59,7 @@ * uncached region. This will no doubt cause big problems if memory allocated * here is not also freed properly. -- JW */ -void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle) +void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *dma_handle) { unsigned long order, vaddr; void *ret; diff --git a/arch/microblaze/mm/fault.c b/arch/microblaze/mm/fault.c index 57bd2a09610..ae97d2ccdc2 100644 --- a/arch/microblaze/mm/fault.c +++ b/arch/microblaze/mm/fault.c @@ -48,7 +48,7 @@ static int store_updates_sp(struct pt_regs *regs) { unsigned int inst; - if (get_user(inst, (unsigned int *)regs->pc)) + if (get_user(inst, (unsigned int __user *)regs->pc)) return 0; /* check for 1 in the rD field */ if (((inst >> 21) & 0x1f) != 1) |