Commit 00607614 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] sparse alpha: the rest of it

A bunch of "return in void function" dealt with, removed bogus extern
from definition of __load_new_mm_context(), sanitized fscking ugly
CROSS_64K() helper (even if sparse doesn't segfault on that anymore,
it's _still_ fscking ugly).
parent d629752f
......@@ -718,7 +718,7 @@ marvel_iounmap(unsigned long addr)
if (((long)addr >> 41) == -2)
return; /* kseg map, nothing to do */
if (addr)
return vfree((void *)(PAGE_MASK & addr));
vfree((void *)(PAGE_MASK & addr));
}
#ifndef CONFIG_ALPHA_GENERIC
......
......@@ -1077,7 +1077,8 @@ marvel_machine_check(u64 vector, u64 la_ptr, struct pt_regs *regs)
default:
/* Don't know it - pass it up. */
return ev7_machine_check(vector, la_ptr, regs);
ev7_machine_check(vector, la_ptr, regs);
return;
}
/*
......
......@@ -407,8 +407,10 @@ titan_machine_check(u64 vector, u64 la_ptr, struct pt_regs *regs)
/*
* Only handle system errors here
*/
if ((vector != SCB_Q_SYSMCHK) && (vector != SCB_Q_SYSERR))
return ev6_machine_check(vector, la_ptr, regs);
if ((vector != SCB_Q_SYSMCHK) && (vector != SCB_Q_SYSERR)) {
ev6_machine_check(vector, la_ptr, regs);
return;
}
/*
* It's a system error, handle it here
......
......@@ -40,7 +40,7 @@ extern void die_if_kernel(char *,struct pt_regs *,long, unsigned long *);
unsigned long last_asn = ASN_FIRST_VERSION;
#endif
extern void
void
__load_new_mm_context(struct mm_struct *next_mm)
{
unsigned long mmc;
......
......@@ -108,10 +108,11 @@ static int FDC2 = -1;
* on that platform... ;-}
*/
#define CROSS_64KB(a,s) \
({ unsigned long __s64 = (unsigned long)(a); \
unsigned long __e64 = __s64 + (unsigned long)(s) - 1; \
(__s64 ^ __e64) & ~0xfffful; })
static inline unsigned long CROSS_64KB(void *a, unsigned long s)
{
unsigned long p = (unsigned long)a;
return ((p + s - 1) ^ p) & ~0xffffUL;
}
#define EXTRA_FLOPPY_PARAMS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment