diff options
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_mci.h | 2 | ||||
-rw-r--r-- | arch/s390/crypto/sha_common.c | 2 | ||||
-rw-r--r-- | drivers/crypto/hifn_795x.c | 2 | ||||
-rw-r--r-- | drivers/isdn/mISDN/l1oip_core.c | 2 | ||||
-rw-r--r-- | drivers/usb/wusbcore/wusbhc.h | 2 | ||||
-rw-r--r-- | drivers/uwb/uwbd.c | 2 | ||||
-rw-r--r-- | fs/cifs/asn1.c | 2 | ||||
-rw-r--r-- | fs/ext4/mballoc.c | 2 | ||||
-rw-r--r-- | fs/udf/inode.c | 2 | ||||
-rw-r--r-- | kernel/trace/trace.h | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-at91/include/mach/at91_mci.h b/arch/arm/mach-at91/include/mach/at91_mci.h index 550d503a1bca..57f8ee154943 100644 --- a/arch/arm/mach-at91/include/mach/at91_mci.h +++ b/arch/arm/mach-at91/include/mach/at91_mci.h | |||
@@ -77,7 +77,7 @@ | |||
77 | 77 | ||
78 | #define AT91_MCI_BLKR 0x18 /* Block Register */ | 78 | #define AT91_MCI_BLKR 0x18 /* Block Register */ |
79 | #define AT91_MCI_BLKR_BCNT(n) ((0xffff & (n)) << 0) /* Block count */ | 79 | #define AT91_MCI_BLKR_BCNT(n) ((0xffff & (n)) << 0) /* Block count */ |
80 | #define AT91_MCI_BLKR_BLKLEN(n) ((0xffff & (n)) << 16) /* Block lenght */ | 80 | #define AT91_MCI_BLKR_BLKLEN(n) ((0xffff & (n)) << 16) /* Block length */ |
81 | 81 | ||
82 | #define AT91_MCI_RSPR(n) (0x20 + ((n) * 4)) /* Response Registers 0-3 */ | 82 | #define AT91_MCI_RSPR(n) (0x20 + ((n) * 4)) /* Response Registers 0-3 */ |
83 | #define AT91_MCR_RDR 0x30 /* Receive Data Register */ | 83 | #define AT91_MCR_RDR 0x30 /* Receive Data Register */ |
diff --git a/arch/s390/crypto/sha_common.c b/arch/s390/crypto/sha_common.c index 7903ec47e6b9..f42dbabc0d30 100644 --- a/arch/s390/crypto/sha_common.c +++ b/arch/s390/crypto/sha_common.c | |||
@@ -79,7 +79,7 @@ int s390_sha_final(struct shash_desc *desc, u8 *out) | |||
79 | memset(ctx->buf + index, 0x00, end - index - 8); | 79 | memset(ctx->buf + index, 0x00, end - index - 8); |
80 | 80 | ||
81 | /* | 81 | /* |
82 | * Append message length. Well, SHA-512 wants a 128 bit lenght value, | 82 | * Append message length. Well, SHA-512 wants a 128 bit length value, |
83 | * nevertheless we use u64, should be enough for now... | 83 | * nevertheless we use u64, should be enough for now... |
84 | */ | 84 | */ |
85 | bits = ctx->count * 8; | 85 | bits = ctx->count * 8; |
diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c index 09ad9154d86c..73e8b1713b54 100644 --- a/drivers/crypto/hifn_795x.c +++ b/drivers/crypto/hifn_795x.c | |||
@@ -321,7 +321,7 @@ static atomic_t hifn_dev_number; | |||
321 | #define HIFN_PUBOPLEN_MOD_M 0x0000007f /* modulus length mask */ | 321 | #define HIFN_PUBOPLEN_MOD_M 0x0000007f /* modulus length mask */ |
322 | #define HIFN_PUBOPLEN_MOD_S 0 /* modulus length shift */ | 322 | #define HIFN_PUBOPLEN_MOD_S 0 /* modulus length shift */ |
323 | #define HIFN_PUBOPLEN_EXP_M 0x0003ff80 /* exponent length mask */ | 323 | #define HIFN_PUBOPLEN_EXP_M 0x0003ff80 /* exponent length mask */ |
324 | #define HIFN_PUBOPLEN_EXP_S 7 /* exponent lenght shift */ | 324 | #define HIFN_PUBOPLEN_EXP_S 7 /* exponent length shift */ |
325 | #define HIFN_PUBOPLEN_RED_M 0x003c0000 /* reducend length mask */ | 325 | #define HIFN_PUBOPLEN_RED_M 0x003c0000 /* reducend length mask */ |
326 | #define HIFN_PUBOPLEN_RED_S 18 /* reducend length shift */ | 326 | #define HIFN_PUBOPLEN_RED_S 18 /* reducend length shift */ |
327 | 327 | ||
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c index 0843fcf8b381..325b1ad7d4b8 100644 --- a/drivers/isdn/mISDN/l1oip_core.c +++ b/drivers/isdn/mISDN/l1oip_core.c | |||
@@ -477,7 +477,7 @@ l1oip_socket_parse(struct l1oip *hc, struct sockaddr_in *sin, u8 *buf, int len) | |||
477 | printk(KERN_DEBUG "%s: received frame, parsing... (%d)\n", | 477 | printk(KERN_DEBUG "%s: received frame, parsing... (%d)\n", |
478 | __func__, len); | 478 | __func__, len); |
479 | 479 | ||
480 | /* check lenght */ | 480 | /* check length */ |
481 | if (len < 1+1+2) { | 481 | if (len < 1+1+2) { |
482 | printk(KERN_WARNING "%s: packet error - length %d below " | 482 | printk(KERN_WARNING "%s: packet error - length %d below " |
483 | "4 bytes\n", __func__, len); | 483 | "4 bytes\n", __func__, len); |
diff --git a/drivers/usb/wusbcore/wusbhc.h b/drivers/usb/wusbcore/wusbhc.h index fd2fd4e277e1..759cda55f7c3 100644 --- a/drivers/usb/wusbcore/wusbhc.h +++ b/drivers/usb/wusbcore/wusbhc.h | |||
@@ -198,7 +198,7 @@ struct wusb_port { | |||
198 | * ports) this HC will take. Read-only. | 198 | * ports) this HC will take. Read-only. |
199 | * | 199 | * |
200 | * @port Array of port status for each fake root port. Guaranteed to | 200 | * @port Array of port status for each fake root port. Guaranteed to |
201 | * always be the same lenght during device existence | 201 | * always be the same length during device existence |
202 | * [this allows for some unlocked but referenced reading]. | 202 | * [this allows for some unlocked but referenced reading]. |
203 | * | 203 | * |
204 | * @mmcies_max Max number of Information Elements this HC can send | 204 | * @mmcies_max Max number of Information Elements this HC can send |
diff --git a/drivers/uwb/uwbd.c b/drivers/uwb/uwbd.c index 5a777d8624da..6210fe1fd1bb 100644 --- a/drivers/uwb/uwbd.c +++ b/drivers/uwb/uwbd.c | |||
@@ -43,7 +43,7 @@ | |||
43 | * | 43 | * |
44 | * EVENTS | 44 | * EVENTS |
45 | * | 45 | * |
46 | * Events have a type, a subtype, a lenght, some other stuff and the | 46 | * Events have a type, a subtype, a length, some other stuff and the |
47 | * data blob, which depends on the event. The header is 'struct | 47 | * data blob, which depends on the event. The header is 'struct |
48 | * uwb_event'; for payloads, see 'struct uwbd_evt_*'. | 48 | * uwb_event'; for payloads, see 'struct uwbd_evt_*'. |
49 | * | 49 | * |
diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c index 20692fbfdb24..a20bea598933 100644 --- a/fs/cifs/asn1.c +++ b/fs/cifs/asn1.c | |||
@@ -136,7 +136,7 @@ asn1_enum_decode(struct asn1_ctx *ctx, __le32 *val) | |||
136 | return 0; | 136 | return 0; |
137 | } | 137 | } |
138 | 138 | ||
139 | ch = *(ctx->pointer)++; /* ch has 0xa, ptr points to lenght octet */ | 139 | ch = *(ctx->pointer)++; /* ch has 0xa, ptr points to length octet */ |
140 | if ((ch) == ASN1_ENUM) /* if ch value is ENUM, 0xa */ | 140 | if ((ch) == ASN1_ENUM) /* if ch value is ENUM, 0xa */ |
141 | *val = *(++(ctx->pointer)); /* value has enum value */ | 141 | *val = *(++(ctx->pointer)); /* value has enum value */ |
142 | else | 142 | else |
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index d34afad3e137..b794dd8141a0 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c | |||
@@ -69,7 +69,7 @@ | |||
69 | * | 69 | * |
70 | * pa_lstart -> the logical start block for this prealloc space | 70 | * pa_lstart -> the logical start block for this prealloc space |
71 | * pa_pstart -> the physical start block for this prealloc space | 71 | * pa_pstart -> the physical start block for this prealloc space |
72 | * pa_len -> lenght for this prealloc space | 72 | * pa_len -> length for this prealloc space |
73 | * pa_free -> free space available in this prealloc space | 73 | * pa_free -> free space available in this prealloc space |
74 | * | 74 | * |
75 | * The inode preallocation space is used looking at the _logical_ start | 75 | * The inode preallocation space is used looking at the _logical_ start |
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index f90231eb2916..772a4fa557f2 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c | |||
@@ -102,7 +102,7 @@ void udf_clear_inode(struct inode *inode) | |||
102 | if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB && | 102 | if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB && |
103 | inode->i_size != iinfo->i_lenExtents) { | 103 | inode->i_size != iinfo->i_lenExtents) { |
104 | printk(KERN_WARNING "UDF-fs (%s): Inode %lu (mode %o) has " | 104 | printk(KERN_WARNING "UDF-fs (%s): Inode %lu (mode %o) has " |
105 | "inode size %llu different from extent lenght %llu. " | 105 | "inode size %llu different from extent length %llu. " |
106 | "Filesystem need not be standards compliant.\n", | 106 | "Filesystem need not be standards compliant.\n", |
107 | inode->i_sb->s_id, inode->i_ino, inode->i_mode, | 107 | inode->i_sb->s_id, inode->i_ino, inode->i_mode, |
108 | (unsigned long long)inode->i_size, | 108 | (unsigned long long)inode->i_size, |
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 4df6a77eb196..e4b32c8aa85f 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h | |||
@@ -549,7 +549,7 @@ static inline int ftrace_trace_task(struct task_struct *task) | |||
549 | * struct trace_parser - servers for reading the user input separated by spaces | 549 | * struct trace_parser - servers for reading the user input separated by spaces |
550 | * @cont: set if the input is not complete - no final space char was found | 550 | * @cont: set if the input is not complete - no final space char was found |
551 | * @buffer: holds the parsed user input | 551 | * @buffer: holds the parsed user input |
552 | * @idx: user input lenght | 552 | * @idx: user input length |
553 | * @size: buffer size | 553 | * @size: buffer size |
554 | */ | 554 | */ |
555 | struct trace_parser { | 555 | struct trace_parser { |