Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 19909
b: refs/heads/master
c: d4264f1
h: refs/heads/master
i:
  19907: fc46773
v: v3
  • Loading branch information
Atsushi Nemoto authored and Ralf Baechle committed Feb 7, 2006
1 parent 73bbab8 commit 91573d5
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2caf190002770b53fdb263ed744802a1b5e81649
refs/heads/master: d4264f183967db9c2dae4275abb98eb1f79facb2
7 changes: 3 additions & 4 deletions trunk/arch/mips/mm/c-r4k.c
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,8 @@ static void r4k_flush_data_cache_page(unsigned long addr)
}

struct flush_icache_range_args {
unsigned long __user start;
unsigned long __user end;
unsigned long start;
unsigned long end;
};

static inline void local_r4k_flush_icache_range(void *args)
Expand Down Expand Up @@ -528,8 +528,7 @@ static inline void local_r4k_flush_icache_range(void *args)
}
}

static void r4k_flush_icache_range(unsigned long __user start,
unsigned long __user end)
static void r4k_flush_icache_range(unsigned long start, unsigned long end)
{
struct flush_icache_range_args args;

Expand Down
5 changes: 2 additions & 3 deletions trunk/arch/mips/mm/cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ void (*flush_cache_range)(struct vm_area_struct *vma, unsigned long start,
unsigned long end);
void (*flush_cache_page)(struct vm_area_struct *vma, unsigned long page,
unsigned long pfn);
void (*flush_icache_range)(unsigned long __user start,
unsigned long __user end);
void (*flush_icache_range)(unsigned long start, unsigned long end);
void (*flush_icache_page)(struct vm_area_struct *vma, struct page *page);

/* MIPS specific cache operations */
Expand All @@ -53,7 +52,7 @@ EXPORT_SYMBOL(_dma_cache_inv);
* We could optimize the case where the cache argument is not BCACHE but
* that seems very atypical use ...
*/
asmlinkage int sys_cacheflush(unsigned long __user addr,
asmlinkage int sys_cacheflush(unsigned long addr,
unsigned long bytes, unsigned int cache)
{
if (bytes == 0)
Expand Down
3 changes: 1 addition & 2 deletions trunk/include/asm-mips/cacheflush.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ static inline void flush_dcache_page(struct page *page)

extern void (*flush_icache_page)(struct vm_area_struct *vma,
struct page *page);
extern void (*flush_icache_range)(unsigned long __user start,
unsigned long __user end);
extern void (*flush_icache_range)(unsigned long start, unsigned long end);
#define flush_cache_vmap(start, end) flush_cache_all()
#define flush_cache_vunmap(start, end) flush_cache_all()

Expand Down

0 comments on commit 91573d5

Please sign in to comment.