From 6fd0b659e27e439261df9cc897b4bf1f5f94a742 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Wed, 8 Jan 2003 02:53:41 -0800 Subject: [PATCH] x86-64 RAID XOR compile fix. Missing macro header. --- include/asm-x86_64/xor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/asm-x86_64/xor.h b/include/asm-x86_64/xor.h index 7e4e56208b8b..f942fcc21831 100644 --- a/include/asm-x86_64/xor.h +++ b/include/asm-x86_64/xor.h @@ -51,7 +51,7 @@ typedef struct { unsigned long a,b; } __attribute__((aligned(16))) xmm_store_t; : "memory"); \ } while(0) -#define XMMS_RESTORE \ +#define XMMS_RESTORE do { \ asm volatile ( \ "sfence ;\n\t" \ "movups (%1),%%xmm0 ;\n\t" \ -- cgit v1.2.3 From 638f34baff63d2f9caa5cbf1f989286f804bf0fd Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Wed, 8 Jan 2003 02:55:45 -0800 Subject: [PATCH] x86-64 spinlock code typo Without this fix, compiling with CONFIG_DEBUG_SPINLOCK dies with an unknown variable error.. --- include/asm-x86_64/spinlock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/asm-x86_64/spinlock.h b/include/asm-x86_64/spinlock.h index b502884f490a..00ae8043a534 100644 --- a/include/asm-x86_64/spinlock.h +++ b/include/asm-x86_64/spinlock.h @@ -15,7 +15,7 @@ extern int printk(const char * fmt, ...) typedef struct { volatile unsigned int lock; -#if SPINLOCK_DEBUG +#if CONFIG_DEBUG_SPINLOCK unsigned magic; #endif } spinlock_t; -- cgit v1.2.3 From 457a03d06ee50c139245b4101117c3591f85ce8c Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Wed, 8 Jan 2003 02:55:59 -0800 Subject: [PATCH] EDD typo. s/boundry/boundary/ --- arch/i386/kernel/edd.c | 4 ++-- include/asm-i386/edd.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/arch/i386/kernel/edd.c b/arch/i386/kernel/edd.c index 0da2265ee99f..132bca8765bb 100644 --- a/arch/i386/kernel/edd.c +++ b/arch/i386/kernel/edd.c @@ -419,8 +419,8 @@ edd_show_info_flags(struct edd_device *edev, char *buf, size_t count, return 0; } - if (info->params.info_flags & EDD_INFO_DMA_BOUNDRY_ERROR_TRANSPARENT) - p += snprintf(p, left, "DMA boundry error transparent\n"); + if (info->params.info_flags & EDD_INFO_DMA_BOUNDARY_ERROR_TRANSPARENT) + p += snprintf(p, left, "DMA boundary error transparent\n"); if (info->params.info_flags & EDD_INFO_GEOMETRY_VALID) p += snprintf(p, left, "geometry valid\n"); if (info->params.info_flags & EDD_INFO_REMOVABLE) diff --git a/include/asm-i386/edd.h b/include/asm-i386/edd.h index c8d04c01d39f..d606a9588b47 100644 --- a/include/asm-i386/edd.h +++ b/include/asm-i386/edd.h @@ -48,7 +48,7 @@ #define EDD_EXT_ENHANCED_DISK_DRIVE_SUPPORT (1 << 2) #define EDD_EXT_64BIT_EXTENSIONS (1 << 3) -#define EDD_INFO_DMA_BOUNDRY_ERROR_TRANSPARENT (1 << 0) +#define EDD_INFO_DMA_BOUNDARY_ERROR_TRANSPARENT (1 << 0) #define EDD_INFO_GEOMETRY_VALID (1 << 1) #define EDD_INFO_REMOVABLE (1 << 2) #define EDD_INFO_WRITE_VERIFY (1 << 3) -- cgit v1.2.3 From dc923df5e38a08d1e51ae4a707163c49576e734e Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Wed, 8 Jan 2003 02:56:06 -0800 Subject: [PATCH] signal.h -W cleanup Next in line for the -W cleanups is this patch from Willy which I've been carrying since 2.5.29 or so. Should be no functional differences, just no more warnings when we compile with -W --- include/linux/signal.h | 59 +++++++++++++++++++------------------------------- 1 file changed, 22 insertions(+), 37 deletions(-) (limited to 'include') diff --git a/include/linux/signal.h b/include/linux/signal.h index c00516609f3f..53d9e4324557 100644 --- a/include/linux/signal.h +++ b/include/linux/signal.h @@ -70,37 +70,24 @@ static inline int sigfindinword(unsigned long word) #define _SIG_SET_BINOP(name, op) \ static inline void name(sigset_t *r, const sigset_t *a, const sigset_t *b) \ { \ + extern void _NSIG_WORDS_is_unsupported_size(void); \ unsigned long a0, a1, a2, a3, b0, b1, b2, b3; \ - unsigned long i; \ \ - for (i = 0; i < _NSIG_WORDS/4; ++i) { \ - a0 = a->sig[4*i+0]; a1 = a->sig[4*i+1]; \ - a2 = a->sig[4*i+2]; a3 = a->sig[4*i+3]; \ - b0 = b->sig[4*i+0]; b1 = b->sig[4*i+1]; \ - b2 = b->sig[4*i+2]; b3 = b->sig[4*i+3]; \ - r->sig[4*i+0] = op(a0, b0); \ - r->sig[4*i+1] = op(a1, b1); \ - r->sig[4*i+2] = op(a2, b2); \ - r->sig[4*i+3] = op(a3, b3); \ - } \ - switch (_NSIG_WORDS % 4) { \ - case 3: \ - a0 = a->sig[4*i+0]; a1 = a->sig[4*i+1]; a2 = a->sig[4*i+2]; \ - b0 = b->sig[4*i+0]; b1 = b->sig[4*i+1]; b2 = b->sig[4*i+2]; \ - r->sig[4*i+0] = op(a0, b0); \ - r->sig[4*i+1] = op(a1, b1); \ - r->sig[4*i+2] = op(a2, b2); \ - break; \ + switch (_NSIG_WORDS) { \ + case 4: \ + a3 = a->sig[3]; a2 = a->sig[2]; \ + b3 = b->sig[3]; b2 = b->sig[2]; \ + r->sig[3] = op(a3, b3); \ + r->sig[2] = op(a2, b2); \ case 2: \ - a0 = a->sig[4*i+0]; a1 = a->sig[4*i+1]; \ - b0 = b->sig[4*i+0]; b1 = b->sig[4*i+1]; \ - r->sig[4*i+0] = op(a0, b0); \ - r->sig[4*i+1] = op(a1, b1); \ - break; \ + a1 = a->sig[1]; b1 = b->sig[1]; \ + r->sig[1] = op(a1, b1); \ case 1: \ - a0 = a->sig[4*i+0]; b0 = b->sig[4*i+0]; \ - r->sig[4*i+0] = op(a0, b0); \ + a0 = a->sig[0]; b0 = b->sig[0]; \ + r->sig[0] = op(a0, b0); \ break; \ + default: \ + _NSIG_WORDS_is_unsupported_size(); \ } \ } @@ -121,18 +108,16 @@ _SIG_SET_BINOP(signandsets, _sig_nand) #define _SIG_SET_OP(name, op) \ static inline void name(sigset_t *set) \ { \ - unsigned long i; \ + extern void _NSIG_WORDS_is_unsupported_size(void); \ \ - for (i = 0; i < _NSIG_WORDS/4; ++i) { \ - set->sig[4*i+0] = op(set->sig[4*i+0]); \ - set->sig[4*i+1] = op(set->sig[4*i+1]); \ - set->sig[4*i+2] = op(set->sig[4*i+2]); \ - set->sig[4*i+3] = op(set->sig[4*i+3]); \ - } \ - switch (_NSIG_WORDS % 4) { \ - case 3: set->sig[4*i+2] = op(set->sig[4*i+2]); \ - case 2: set->sig[4*i+1] = op(set->sig[4*i+1]); \ - case 1: set->sig[4*i+0] = op(set->sig[4*i+0]); \ + switch (_NSIG_WORDS) { \ + case 4: set->sig[3] = op(set->sig[3]); \ + set->sig[2] = op(set->sig[2]); \ + case 2: set->sig[1] = op(set->sig[1]); \ + case 1: set->sig[0] = op(set->sig[0]); \ + break; \ + default: \ + _NSIG_WORDS_is_unsupported_size(); \ } \ } -- cgit v1.2.3