Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (56 commits) doc: fix typo in comment explaining rb_tree usage Remove fs/ntfs/ChangeLog doc: fix console doc typo doc: cpuset: Update the cpuset flag file Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed Remove drivers/parport/ChangeLog Remove drivers/char/ChangeLog doc: typo - Table 1-2 should refer to "status", not "statm" tree-wide: fix typos "ass?o[sc]iac?te" -> "associate" in comments No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h devres/irq: Fix devm_irq_match comment Remove reference to kthread_create_on_cpu tree-wide: Assorted spelling fixes tree-wide: fix 'lenght' typo in comments and code drm/kms: fix spelling in error message doc: capitalization and other minor fixes in pnp doc devres: typo fix s/dev/devm/ Remove redundant trailing semicolons from macros fix typo "definetly" -> "definitely" in comment tree-wide: s/widht/width/g typo in comments ... Fix trivial conflict in Documentation/laptops/00-INDEX
This commit is contained in:
+1
-1
@@ -398,7 +398,7 @@ static void kauditd_send_skb(struct sk_buff *skb)
|
||||
skb_get(skb);
|
||||
err = netlink_unicast(audit_sock, skb, audit_nlk_pid, 0);
|
||||
if (err < 0) {
|
||||
BUG_ON(err != -ECONNREFUSED); /* Shoudn't happen */
|
||||
BUG_ON(err != -ECONNREFUSED); /* Shouldn't happen */
|
||||
printk(KERN_ERR "audit: *NO* daemon at audit_pid=%d\n", audit_pid);
|
||||
audit_log_lost("auditd dissapeared\n");
|
||||
audit_pid = 0;
|
||||
|
||||
+1
-1
@@ -554,7 +554,7 @@ out:
|
||||
* signal. The occurence is latched into the irq controller hardware
|
||||
* and must be acked in order to be reenabled. After the ack another
|
||||
* interrupt can happen on the same source even before the first one
|
||||
* is handled by the assosiacted event handler. If this happens it
|
||||
* is handled by the associated event handler. If this happens it
|
||||
* might be necessary to disable (mask) the interrupt depending on the
|
||||
* controller hardware. This requires to reenable the interrupt inside
|
||||
* of the loop which handles the interrupts which have arrived while
|
||||
|
||||
+2
-2
@@ -42,7 +42,7 @@ static int devm_irq_match(struct device *dev, void *res, void *data)
|
||||
* automatically freed on driver detach.
|
||||
*
|
||||
* If an IRQ allocated with this function needs to be freed
|
||||
* separately, dev_free_irq() must be used.
|
||||
* separately, devm_free_irq() must be used.
|
||||
*/
|
||||
int devm_request_threaded_irq(struct device *dev, unsigned int irq,
|
||||
irq_handler_t handler, irq_handler_t thread_fn,
|
||||
@@ -81,7 +81,7 @@ EXPORT_SYMBOL(devm_request_threaded_irq);
|
||||
* Except for the extra @dev argument, this function takes the
|
||||
* same arguments and performs the same function as free_irq().
|
||||
* This function instead of free_irq() should be used to manually
|
||||
* free IRQs allocated with dev_request_irq().
|
||||
* free IRQs allocated with devm_request_irq().
|
||||
*/
|
||||
void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id)
|
||||
{
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ static ssize_t uevent_seqnum_show(struct kobject *kobj,
|
||||
}
|
||||
KERNEL_ATTR_RO(uevent_seqnum);
|
||||
|
||||
/* uevent helper program, used during early boo */
|
||||
/* uevent helper program, used during early boot */
|
||||
static ssize_t uevent_helper_show(struct kobject *kobj,
|
||||
struct kobj_attribute *attr, char *buf)
|
||||
{
|
||||
|
||||
+3
-3
@@ -401,8 +401,8 @@ int param_get_string(char *buffer, struct kernel_param *kp)
|
||||
}
|
||||
|
||||
/* sysfs output in /sys/modules/XYZ/parameters/ */
|
||||
#define to_module_attr(n) container_of(n, struct module_attribute, attr);
|
||||
#define to_module_kobject(n) container_of(n, struct module_kobject, kobj);
|
||||
#define to_module_attr(n) container_of(n, struct module_attribute, attr)
|
||||
#define to_module_kobject(n) container_of(n, struct module_kobject, kobj)
|
||||
|
||||
extern struct kernel_param __start___param[], __stop___param[];
|
||||
|
||||
@@ -420,7 +420,7 @@ struct module_param_attrs
|
||||
};
|
||||
|
||||
#ifdef CONFIG_SYSFS
|
||||
#define to_param_attr(n) container_of(n, struct param_attribute, mattr);
|
||||
#define to_param_attr(n) container_of(n, struct param_attribute, mattr)
|
||||
|
||||
static ssize_t param_attr_show(struct module_attribute *mattr,
|
||||
struct module *mod, char *buf)
|
||||
|
||||
@@ -56,7 +56,7 @@ static int convert_prio(int prio)
|
||||
* @lowest_mask: A mask to fill in with selected CPUs (or NULL)
|
||||
*
|
||||
* Note: This function returns the recommended CPUs as calculated during the
|
||||
* current invokation. By the time the call returns, the CPUs may have in
|
||||
* current invocation. By the time the call returns, the CPUs may have in
|
||||
* fact changed priorities any number of times. While not ideal, it is not
|
||||
* an issue of correctness since the normal rebalancer logic will correct
|
||||
* any discrepancies created by racing against the uncertainty of the current
|
||||
|
||||
@@ -2542,7 +2542,7 @@ EXPORT_SYMBOL_GPL(ring_buffer_record_disable);
|
||||
* @buffer: The ring buffer to enable writes
|
||||
*
|
||||
* Note, multiple disables will need the same number of enables
|
||||
* to truely enable the writing (much like preempt_disable).
|
||||
* to truly enable the writing (much like preempt_disable).
|
||||
*/
|
||||
void ring_buffer_record_enable(struct ring_buffer *buffer)
|
||||
{
|
||||
@@ -2578,7 +2578,7 @@ EXPORT_SYMBOL_GPL(ring_buffer_record_disable_cpu);
|
||||
* @cpu: The CPU to enable.
|
||||
*
|
||||
* Note, multiple disables will need the same number of enables
|
||||
* to truely enable the writing (much like preempt_disable).
|
||||
* to truly enable the writing (much like preempt_disable).
|
||||
*/
|
||||
void ring_buffer_record_enable_cpu(struct ring_buffer *buffer, int cpu)
|
||||
{
|
||||
|
||||
@@ -550,7 +550,7 @@ static inline int ftrace_trace_task(struct task_struct *task)
|
||||
* struct trace_parser - servers for reading the user input separated by spaces
|
||||
* @cont: set if the input is not complete - no final space char was found
|
||||
* @buffer: holds the parsed user input
|
||||
* @idx: user input lenght
|
||||
* @idx: user input length
|
||||
* @size: buffer size
|
||||
*/
|
||||
struct trace_parser {
|
||||
|
||||
Reference in New Issue
Block a user