Commit f2b5f0fd authored by Richard Henderson's avatar Richard Henderson

Merge are.twiddle.net:/home/rth/BK/linus-2.5

into are.twiddle.net:/home/rth/BK/axp-2.5
parents 42382f86 2e4e0292
...@@ -22,8 +22,10 @@ ...@@ -22,8 +22,10 @@
static int static int
titan_parse_c_misc(u64 c_misc, int print) titan_parse_c_misc(u64 c_misc, int print)
{ {
#ifdef CONFIG_VERBOSE_MCHECK
char *src; char *src;
int nxs = 0; int nxs = 0;
#endif
int status = MCHK_DISPOSITION_REPORT; int status = MCHK_DISPOSITION_REPORT;
#define TITAN__CCHIP_MISC__NXM (1UL << 28) #define TITAN__CCHIP_MISC__NXM (1UL << 28)
...@@ -263,11 +265,11 @@ titan_parse_p_perror(int which, int port, u64 perror, int print) ...@@ -263,11 +265,11 @@ titan_parse_p_perror(int which, int port, u64 perror, int print)
static int static int
titan_parse_p_agperror(int which, u64 agperror, int print) titan_parse_p_agperror(int which, u64 agperror, int print)
{ {
int status = MCHK_DISPOSITION_REPORT;
#ifdef CONFIG_VERBOSE_MCHECK
int cmd, len; int cmd, len;
unsigned long addr; unsigned long addr;
int status = MCHK_DISPOSITION_REPORT;
#ifdef CONFIG_VERBOSE_MCHECK
char *agperror_cmd[] = { "Read (low-priority)", "Read (high-priority)", char *agperror_cmd[] = { "Read (low-priority)", "Read (high-priority)",
"Write (low-priority)", "Write (low-priority)",
"Write (high-priority)", "Write (high-priority)",
...@@ -575,14 +577,14 @@ titan_register_error_handlers(void) ...@@ -575,14 +577,14 @@ titan_register_error_handlers(void)
static int static int
privateer_process_680_frame(struct el_common *mchk_header, int print) privateer_process_680_frame(struct el_common *mchk_header, int print)
{ {
int status = MCHK_DISPOSITION_UNKNOWN_ERROR;
#ifdef CONFIG_VERBOSE_MCHECK
struct el_PRIVATEER_envdata_mcheck *emchk = struct el_PRIVATEER_envdata_mcheck *emchk =
(struct el_PRIVATEER_envdata_mcheck *) (struct el_PRIVATEER_envdata_mcheck *)
((unsigned long)mchk_header + mchk_header->sys_offset); ((unsigned long)mchk_header + mchk_header->sys_offset);
int status = MCHK_DISPOSITION_UNKNOWN_ERROR;
/* TODO - catagorize errors, for now, no error */ /* TODO - catagorize errors, for now, no error */
#ifdef CONFIG_VERBOSE_MCHECK
if (!print) if (!print)
return status; return status;
......
...@@ -69,9 +69,6 @@ struct flock { ...@@ -69,9 +69,6 @@ struct flock {
__kernel_pid_t l_pid; __kernel_pid_t l_pid;
}; };
#ifdef __KERNEL__
#define flock64 flock
#endif
#define F_LINUX_SPECIFIC_BASE 1024 #define F_LINUX_SPECIFIC_BASE 1024
#endif #endif
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