diff options
| author | Rob Herring <[email protected]> | 2020-06-12 09:57:00 -0600 |
|---|---|---|
| committer | Rob Herring <[email protected]> | 2020-06-12 09:57:00 -0600 |
| commit | 8440d4a75d90556cfb8fb3e244443f67381aafd6 (patch) | |
| tree | 2e1c986942c3beb6257121e52449f827a8ce4eaf /include/linux/timer.h | |
| parent | f8d8b46cd20e3a262c17ba1061640d9c190ad769 (diff) | |
| parent | 447615701525c910a386a491a6780dec4971f797 (diff) | |
Merge branch 'dt/schema-cleanups' into dt/linus
Diffstat (limited to 'include/linux/timer.h')
| -rw-r--r-- | include/linux/timer.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h index 0dc19a8c39c9..07910ae5ddd9 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -201,8 +201,7 @@ struct ctl_table; extern unsigned int sysctl_timer_migration; int timer_migration_handler(struct ctl_table *table, int write, - void __user *buffer, size_t *lenp, - loff_t *ppos); + void *buffer, size_t *lenp, loff_t *ppos); #endif unsigned long __round_jiffies(unsigned long j, int cpu); |