diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/audit.c | 2 | ||||
-rw-r--r-- | kernel/irq/chip.c | 2 | ||||
-rw-r--r-- | kernel/irq/devres.c | 4 | ||||
-rw-r--r-- | kernel/ksysfs.c | 2 | ||||
-rw-r--r-- | kernel/params.c | 6 | ||||
-rw-r--r-- | kernel/sched_cpupri.c | 2 | ||||
-rw-r--r-- | kernel/trace/ring_buffer.c | 4 | ||||
-rw-r--r-- | kernel/trace/trace.h | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index 5feed232be9d..78f7f86aa238 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
@@ -398,7 +398,7 @@ static void kauditd_send_skb(struct sk_buff *skb) | |||
398 | skb_get(skb); | 398 | skb_get(skb); |
399 | err = netlink_unicast(audit_sock, skb, audit_nlk_pid, 0); | 399 | err = netlink_unicast(audit_sock, skb, audit_nlk_pid, 0); |
400 | if (err < 0) { | 400 | if (err < 0) { |
401 | BUG_ON(err != -ECONNREFUSED); /* Shoudn't happen */ | 401 | BUG_ON(err != -ECONNREFUSED); /* Shouldn't happen */ |
402 | printk(KERN_ERR "audit: *NO* daemon at audit_pid=%d\n", audit_pid); | 402 | printk(KERN_ERR "audit: *NO* daemon at audit_pid=%d\n", audit_pid); |
403 | audit_log_lost("auditd dissapeared\n"); | 403 | audit_log_lost("auditd dissapeared\n"); |
404 | audit_pid = 0; | 404 | audit_pid = 0; |
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index d70394f12ee9..42ec11b2af8a 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c | |||
@@ -554,7 +554,7 @@ out: | |||
554 | * signal. The occurence is latched into the irq controller hardware | 554 | * signal. The occurence is latched into the irq controller hardware |
555 | * and must be acked in order to be reenabled. After the ack another | 555 | * and must be acked in order to be reenabled. After the ack another |
556 | * interrupt can happen on the same source even before the first one | 556 | * interrupt can happen on the same source even before the first one |
557 | * is handled by the assosiacted event handler. If this happens it | 557 | * is handled by the associated event handler. If this happens it |
558 | * might be necessary to disable (mask) the interrupt depending on the | 558 | * might be necessary to disable (mask) the interrupt depending on the |
559 | * controller hardware. This requires to reenable the interrupt inside | 559 | * controller hardware. This requires to reenable the interrupt inside |
560 | * of the loop which handles the interrupts which have arrived while | 560 | * of the loop which handles the interrupts which have arrived while |
diff --git a/kernel/irq/devres.c b/kernel/irq/devres.c index d06df9c41cba..1ef4ffcdfa55 100644 --- a/kernel/irq/devres.c +++ b/kernel/irq/devres.c | |||
@@ -42,7 +42,7 @@ static int devm_irq_match(struct device *dev, void *res, void *data) | |||
42 | * automatically freed on driver detach. | 42 | * automatically freed on driver detach. |
43 | * | 43 | * |
44 | * If an IRQ allocated with this function needs to be freed | 44 | * If an IRQ allocated with this function needs to be freed |
45 | * separately, dev_free_irq() must be used. | 45 | * separately, devm_free_irq() must be used. |
46 | */ | 46 | */ |
47 | int devm_request_threaded_irq(struct device *dev, unsigned int irq, | 47 | int devm_request_threaded_irq(struct device *dev, unsigned int irq, |
48 | irq_handler_t handler, irq_handler_t thread_fn, | 48 | irq_handler_t handler, irq_handler_t thread_fn, |
@@ -81,7 +81,7 @@ EXPORT_SYMBOL(devm_request_threaded_irq); | |||
81 | * Except for the extra @dev argument, this function takes the | 81 | * Except for the extra @dev argument, this function takes the |
82 | * same arguments and performs the same function as free_irq(). | 82 | * same arguments and performs the same function as free_irq(). |
83 | * This function instead of free_irq() should be used to manually | 83 | * This function instead of free_irq() should be used to manually |
84 | * free IRQs allocated with dev_request_irq(). | 84 | * free IRQs allocated with devm_request_irq(). |
85 | */ | 85 | */ |
86 | void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id) | 86 | void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id) |
87 | { | 87 | { |
diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c index 6b1ccc3f0205..21fe3c426948 100644 --- a/kernel/ksysfs.c +++ b/kernel/ksysfs.c | |||
@@ -33,7 +33,7 @@ static ssize_t uevent_seqnum_show(struct kobject *kobj, | |||
33 | } | 33 | } |
34 | KERNEL_ATTR_RO(uevent_seqnum); | 34 | KERNEL_ATTR_RO(uevent_seqnum); |
35 | 35 | ||
36 | /* uevent helper program, used during early boo */ | 36 | /* uevent helper program, used during early boot */ |
37 | static ssize_t uevent_helper_show(struct kobject *kobj, | 37 | static ssize_t uevent_helper_show(struct kobject *kobj, |
38 | struct kobj_attribute *attr, char *buf) | 38 | struct kobj_attribute *attr, char *buf) |
39 | { | 39 | { |
diff --git a/kernel/params.c b/kernel/params.c index 8d95f5451b22..0c4fba664090 100644 --- a/kernel/params.c +++ b/kernel/params.c | |||
@@ -401,8 +401,8 @@ int param_get_string(char *buffer, struct kernel_param *kp) | |||
401 | } | 401 | } |
402 | 402 | ||
403 | /* sysfs output in /sys/modules/XYZ/parameters/ */ | 403 | /* sysfs output in /sys/modules/XYZ/parameters/ */ |
404 | #define to_module_attr(n) container_of(n, struct module_attribute, attr); | 404 | #define to_module_attr(n) container_of(n, struct module_attribute, attr) |
405 | #define to_module_kobject(n) container_of(n, struct module_kobject, kobj); | 405 | #define to_module_kobject(n) container_of(n, struct module_kobject, kobj) |
406 | 406 | ||
407 | extern struct kernel_param __start___param[], __stop___param[]; | 407 | extern struct kernel_param __start___param[], __stop___param[]; |
408 | 408 | ||
@@ -420,7 +420,7 @@ struct module_param_attrs | |||
420 | }; | 420 | }; |
421 | 421 | ||
422 | #ifdef CONFIG_SYSFS | 422 | #ifdef CONFIG_SYSFS |
423 | #define to_param_attr(n) container_of(n, struct param_attribute, mattr); | 423 | #define to_param_attr(n) container_of(n, struct param_attribute, mattr) |
424 | 424 | ||
425 | static ssize_t param_attr_show(struct module_attribute *mattr, | 425 | static ssize_t param_attr_show(struct module_attribute *mattr, |
426 | struct module *mod, char *buf) | 426 | struct module *mod, char *buf) |
diff --git a/kernel/sched_cpupri.c b/kernel/sched_cpupri.c index 82095bf2099f..fccf9fbb0d7b 100644 --- a/kernel/sched_cpupri.c +++ b/kernel/sched_cpupri.c | |||
@@ -56,7 +56,7 @@ static int convert_prio(int prio) | |||
56 | * @lowest_mask: A mask to fill in with selected CPUs (or NULL) | 56 | * @lowest_mask: A mask to fill in with selected CPUs (or NULL) |
57 | * | 57 | * |
58 | * Note: This function returns the recommended CPUs as calculated during the | 58 | * Note: This function returns the recommended CPUs as calculated during the |
59 | * current invokation. By the time the call returns, the CPUs may have in | 59 | * current invocation. By the time the call returns, the CPUs may have in |
60 | * fact changed priorities any number of times. While not ideal, it is not | 60 | * fact changed priorities any number of times. While not ideal, it is not |
61 | * an issue of correctness since the normal rebalancer logic will correct | 61 | * an issue of correctness since the normal rebalancer logic will correct |
62 | * any discrepancies created by racing against the uncertainty of the current | 62 | * any discrepancies created by racing against the uncertainty of the current |
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 0287f9f52f5a..a2f0fe951831 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
@@ -2542,7 +2542,7 @@ EXPORT_SYMBOL_GPL(ring_buffer_record_disable); | |||
2542 | * @buffer: The ring buffer to enable writes | 2542 | * @buffer: The ring buffer to enable writes |
2543 | * | 2543 | * |
2544 | * Note, multiple disables will need the same number of enables | 2544 | * Note, multiple disables will need the same number of enables |
2545 | * to truely enable the writing (much like preempt_disable). | 2545 | * to truly enable the writing (much like preempt_disable). |
2546 | */ | 2546 | */ |
2547 | void ring_buffer_record_enable(struct ring_buffer *buffer) | 2547 | void ring_buffer_record_enable(struct ring_buffer *buffer) |
2548 | { | 2548 | { |
@@ -2578,7 +2578,7 @@ EXPORT_SYMBOL_GPL(ring_buffer_record_disable_cpu); | |||
2578 | * @cpu: The CPU to enable. | 2578 | * @cpu: The CPU to enable. |
2579 | * | 2579 | * |
2580 | * Note, multiple disables will need the same number of enables | 2580 | * Note, multiple disables will need the same number of enables |
2581 | * to truely enable the writing (much like preempt_disable). | 2581 | * to truly enable the writing (much like preempt_disable). |
2582 | */ | 2582 | */ |
2583 | void ring_buffer_record_enable_cpu(struct ring_buffer *buffer, int cpu) | 2583 | void ring_buffer_record_enable_cpu(struct ring_buffer *buffer, int cpu) |
2584 | { | 2584 | { |
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index fd05bcaf91b0..09b39112a5e2 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h | |||
@@ -550,7 +550,7 @@ static inline int ftrace_trace_task(struct task_struct *task) | |||
550 | * struct trace_parser - servers for reading the user input separated by spaces | 550 | * struct trace_parser - servers for reading the user input separated by spaces |
551 | * @cont: set if the input is not complete - no final space char was found | 551 | * @cont: set if the input is not complete - no final space char was found |
552 | * @buffer: holds the parsed user input | 552 | * @buffer: holds the parsed user input |
553 | * @idx: user input lenght | 553 | * @idx: user input length |
554 | * @size: buffer size | 554 | * @size: buffer size |
555 | */ | 555 | */ |
556 | struct trace_parser { | 556 | struct trace_parser { |