Quoth Andrew: - Most of MM. Still waiting for the poweroc guys to get off their butts and review some threaded hugepages patches. - alpha - vfs bits - drivers/misc - a few core kerenl tweaks - printk() features - MAINTAINERS updates - backlight merge - leds merge - various lib/ updates - checkpatch updates * akpm: (127 commits) epoll: fix spurious lockdep warnings checkpatch: add a --strict check for utf-8 in commit logs kernel.h/checkpatch: mark strict_strto<foo> and simple_strto<foo> as obsolete llist-return-whether-list-is-empty-before-adding-in-llist_add-fix wireless: at76c50x: follow rename pack_hex_byte to hex_byte_pack fat: follow rename pack_hex_byte() to hex_byte_pack() security: follow rename pack_hex_byte() to hex_byte_pack() kgdb: follow rename pack_hex_byte() to hex_byte_pack() lib: rename pack_hex_byte() to hex_byte_pack() lib/string.c: fix strim() semantics for strings that have only blanks lib/idr.c: fix comment for ida_get_new_above() lib/percpu_counter.c: enclose hotplug only variables in hotplug ifdef lib/bitmap.c: quiet sparse noise about address space lib/spinlock_debug.c: print owner on spinlock lockup lib/kstrtox: common code between kstrto*() and simple_strto*() functions drivers/leds/leds-lp5521.c: check if reset is successful leds: turn the blink_timer off before starting to blink leds: save the delay values after a successful call to blink_set() drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing drivers/leds/leds-lm3530.c: add __devexit_p where needed ...
Showing the changes to include/linux (41 of 194 files). Show all
Unified · Split
| @@ -584,14 +584,13 @@ extern int audit_signals; · 583 unmodified lines | ||
| 584 | 584 | #ifdef CONFIG_AUDIT |
| 585 | 585 | /* These are defined in audit.c */ |
| 586 | 586 | /* Public API */ |
| 587 | −extern void audit_log(struct audit_context *ctx, gfp_t gfp_mask, | |
| 588 | − int type, const char *fmt, ...) | |
| 589 | − __attribute__((format(printf,4,5))); | |
| 587 | +extern __printf(4, 5) | |
| 588 | +void audit_log(struct audit_context *ctx, gfp_t gfp_mask, int type, | |
| 589 | + const char *fmt, ...); | |
| 590 | 590 | |
| 591 | 591 | extern struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask, int type); |
| 592 | −extern void audit_log_format(struct audit_buffer *ab, | |
| 593 | − const char *fmt, ...) | |
| 594 | − __attribute__((format(printf,2,3))); | |
| 592 | +extern __printf(2, 3) | |
| 593 | +void audit_log_format(struct audit_buffer *ab, const char *fmt, ...); | |
| 595 | 594 | extern void audit_log_end(struct audit_buffer *ab); |
| 596 | 595 | extern int audit_string_contains_control(const char *string, |
| 597 | 596 | size_t len); |
| @@ -170,7 +170,7 @@ extern void blk_trace_shutdown(struct request_queue *); · 169 unmodified lines | ||
| 170 | 170 | extern int do_blk_trace_setup(struct request_queue *q, char *name, |
| 171 | 171 | dev_t dev, struct block_device *bdev, |
| 172 | 172 | struct blk_user_trace_setup *buts); |
| 173 | −extern __attribute__((format(printf, 2, 3))) | |
| 173 | +extern __printf(2, 3) | |
| 174 | 174 | void __trace_note_message(struct blk_trace *, const char *fmt, ...); |
| 175 | 175 | |
| 176 | 176 | /** |
| @@ -24,8 +24,6 @@ extern unsigned long try_to_compact_pages(struct zonelist *zonelist, · 23 unmodified lines | ||
| 24 | 24 | int order, gfp_t gfp_mask, nodemask_t *mask, |
| 25 | 25 | bool sync); |
| 26 | 26 | extern unsigned long compaction_suitable(struct zone *zone, int order); |
| 27 | −extern unsigned long compact_zone_order(struct zone *zone, int order, | |
| 28 | − gfp_t gfp_mask, bool sync); | |
| 29 | 27 | |
| 30 | 28 | /* Do not skip compaction more than 64 times */ |
| 31 | 29 | #define COMPACT_MAX_DEFER_SHIFT 6 |
| @@ -69,12 +67,6 @@ static inline unsigned long compaction_suitable(struct zone *zone, int order) · 37 unmodified lines | ||
| 69 | 67 | return COMPACT_SKIPPED; |
| 70 | 68 | } |
| 71 | 69 | |
| 72 | −static inline unsigned long compact_zone_order(struct zone *zone, int order, | |
| 73 | − gfp_t gfp_mask, bool sync) | |
| 74 | −{ | |
| 75 | − return COMPACT_CONTINUE; | |
| 76 | −} | |
| 77 | − | |
| 78 | 70 | static inline void defer_compaction(struct zone *zone) |
| 79 | 71 | { |
| 80 | 72 | } |
| @@ -547,7 +547,8 @@ extern ssize_t compat_rw_copy_check_uvector(int type, · 546 unmodified lines | ||
| 547 | 547 | const struct compat_iovec __user *uvector, |
| 548 | 548 | unsigned long nr_segs, |
| 549 | 549 | unsigned long fast_segs, struct iovec *fast_pointer, |
| 550 | − struct iovec **ret_pointer); | |
| 550 | + struct iovec **ret_pointer, | |
| 551 | + int check_access); | |
| 551 | 552 | |
| 552 | 553 | extern void __user *compat_alloc_user_space(unsigned long len); |
| 553 | 554 | |
| @@ -622,8 +622,8 @@ static inline const char *dev_name(const struct device *dev) · 621 unmodified lines | ||
| 622 | 622 | return kobject_name(&dev->kobj); |
| 623 | 623 | } |
| 624 | 624 | |
| 625 | −extern int dev_set_name(struct device *dev, const char *name, ...) | |
| 626 | − __attribute__((format(printf, 2, 3))); | |
| 625 | +extern __printf(2, 3) | |
| 626 | +int dev_set_name(struct device *dev, const char *name, ...); | |
| 627 | 627 | |
| 628 | 628 | #ifdef CONFIG_NUMA |
| 629 | 629 | static inline int dev_to_node(struct device *dev) |
| @@ -753,10 +753,10 @@ extern struct device *device_create_vargs(struct class *cls, · 123 unmodified lines | ||
| 753 | 753 | void *drvdata, |
| 754 | 754 | const char *fmt, |
| 755 | 755 | va_list vargs); |
| 756 | −extern struct device *device_create(struct class *cls, struct device *parent, | |
| 757 | − dev_t devt, void *drvdata, | |
| 758 | − const char *fmt, ...) | |
| 759 | − __attribute__((format(printf, 5, 6))); | |
| 756 | +extern __printf(5, 6) | |
| 757 | +struct device *device_create(struct class *cls, struct device *parent, | |
| 758 | + dev_t devt, void *drvdata, | |
| 759 | + const char *fmt, ...); | |
| 760 | 760 | extern void device_destroy(struct class *cls, dev_t devt); |
| 761 | 761 | |
| 762 | 762 | /* |
| @@ -800,64 +800,56 @@ extern const char *dev_driver_string(const struct device *dev); · 37 unmodified lines | ||
| 800 | 800 | |
| 801 | 801 | extern int __dev_printk(const char *level, const struct device *dev, |
| 802 | 802 | struct va_format *vaf); |
| 803 | −extern int dev_printk(const char *level, const struct device *dev, | |
| 804 | − const char *fmt, ...) | |
| 805 | − __attribute__ ((format (printf, 3, 4))); | |
| 806 | −extern int dev_emerg(const struct device *dev, const char *fmt, ...) | |
| 807 | − __attribute__ ((format (printf, 2, 3))); | |
| 808 | −extern int dev_alert(const struct device *dev, const char *fmt, ...) | |
| 809 | − __attribute__ ((format (printf, 2, 3))); | |
| 810 | −extern int dev_crit(const struct device *dev, const char *fmt, ...) | |
| 811 | − __attribute__ ((format (printf, 2, 3))); | |
| 812 | −extern int dev_err(const struct device *dev, const char *fmt, ...) | |
| 813 | − __attribute__ ((format (printf, 2, 3))); | |
| 814 | −extern int dev_warn(const struct device *dev, const char *fmt, ...) | |
| 815 | − __attribute__ ((format (printf, 2, 3))); | |
| 816 | −extern int dev_notice(const struct device *dev, const char *fmt, ...) | |
| 817 | − __attribute__ ((format (printf, 2, 3))); | |
| 818 | −extern int _dev_info(const struct device *dev, const char *fmt, ...) | |
| 819 | − __attribute__ ((format (printf, 2, 3))); | |
| 803 | +extern __printf(3, 4) | |
| 804 | +int dev_printk(const char *level, const struct device *dev, | |
| 805 | + const char *fmt, ...) | |
| 806 | + ; | |
| 807 | +extern __printf(2, 3) | |
| 808 | +int dev_emerg(const struct device *dev, const char *fmt, ...); | |
| 809 | +extern __printf(2, 3) | |
| 810 | +int dev_alert(const struct device *dev, const char *fmt, ...); | |
| 811 | +extern __printf(2, 3) | |
| 812 | +int dev_crit(const struct device *dev, const char *fmt, ...); | |
| 813 | +extern __printf(2, 3) | |
| 814 | +int dev_err(const struct device *dev, const char *fmt, ...); | |
| 815 | +extern __printf(2, 3) | |
| 816 | +int dev_warn(const struct device *dev, const char *fmt, ...); | |
| 817 | +extern __printf(2, 3) | |
| 818 | +int dev_notice(const struct device *dev, const char *fmt, ...); | |
| 819 | +extern __printf(2, 3) | |
| 820 | +int _dev_info(const struct device *dev, const char *fmt, ...); | |
| 820 | 821 | |
| 821 | 822 | #else |
| 822 | 823 | |
| 823 | 824 | static inline int __dev_printk(const char *level, const struct device *dev, |
| 824 | 825 | struct va_format *vaf) |
| 825 | − { return 0; } | |
| 826 | −static inline int dev_printk(const char *level, const struct device *dev, | |
| 827 | − const char *fmt, ...) | |
| 828 | − __attribute__ ((format (printf, 3, 4))); | |
| 829 | −static inline int dev_printk(const char *level, const struct device *dev, | |
| 830 | − const char *fmt, ...) | |
| 831 | − { return 0; } | |
| 832 | − | |
| 833 | −static inline int dev_emerg(const struct device *dev, const char *fmt, ...) | |
| 834 | − __attribute__ ((format (printf, 2, 3))); | |
| 835 | −static inline int dev_emerg(const struct device *dev, const char *fmt, ...) | |
| 836 | − { return 0; } | |
| 837 | −static inline int dev_crit(const struct device *dev, const char *fmt, ...) | |
| 838 | − __attribute__ ((format (printf, 2, 3))); | |
| 839 | −static inline int dev_crit(const struct device *dev, const char *fmt, ...) | |
| 840 | − { return 0; } | |
| 841 | −static inline int dev_alert(const struct device *dev, const char *fmt, ...) | |
| 842 | − __attribute__ ((format (printf, 2, 3))); | |
| 843 | −static inline int dev_alert(const struct device *dev, const char *fmt, ...) | |
| 844 | − { return 0; } | |
| 845 | −static inline int dev_err(const struct device *dev, const char *fmt, ...) | |
| 846 | − __attribute__ ((format (printf, 2, 3))); | |
| 847 | −static inline int dev_err(const struct device *dev, const char *fmt, ...) | |
| 848 | − { return 0; } | |
| 849 | −static inline int dev_warn(const struct device *dev, const char *fmt, ...) | |
| 850 | − __attribute__ ((format (printf, 2, 3))); | |
| 851 | −static inline int dev_warn(const struct device *dev, const char *fmt, ...) | |
| 852 | − { return 0; } | |
| 853 | −static inline int dev_notice(const struct device *dev, const char *fmt, ...) | |
| 854 | − __attribute__ ((format (printf, 2, 3))); | |
| 855 | −static inline int dev_notice(const struct device *dev, const char *fmt, ...) | |
| 856 | − { return 0; } | |
| 857 | −static inline int _dev_info(const struct device *dev, const char *fmt, ...) | |
| 858 | − __attribute__ ((format (printf, 2, 3))); | |
| 859 | −static inline int _dev_info(const struct device *dev, const char *fmt, ...) | |
| 860 | − { return 0; } | |
| 826 | +{ return 0; } | |
| 827 | +static inline __printf(3, 4) | |
| 828 | +int dev_printk(const char *level, const struct device *dev, | |
| 829 | + const char *fmt, ...) | |
| 830 | +{ return 0; } | |
| 831 | + | |
| 832 | +static inline __printf(2, 3) | |
| 833 | +int dev_emerg(const struct device *dev, const char *fmt, ...) | |
| 834 | +{ return 0; } | |
| 835 | +static inline __printf(2, 3) | |
| 836 | +int dev_crit(const struct device *dev, const char *fmt, ...) | |
| 837 | +{ return 0; } | |
| 838 | +static inline __printf(2, 3) | |
| 839 | +int dev_alert(const struct device *dev, const char *fmt, ...) | |
| 840 | +{ return 0; } | |
| 841 | +static inline __printf(2, 3) | |
| 842 | +int dev_err(const struct device *dev, const char *fmt, ...) | |
| 843 | +{ return 0; } | |
| 844 | +static inline __printf(2, 3) | |
| 845 | +int dev_warn(const struct device *dev, const char *fmt, ...) | |
| 846 | +{ return 0; } | |
| 847 | +static inline __printf(2, 3) | |
| 848 | +int dev_notice(const struct device *dev, const char *fmt, ...) | |
| 849 | +{ return 0; } | |
| 850 | +static inline __printf(2, 3) | |
| 851 | +int _dev_info(const struct device *dev, const char *fmt, ...) | |
| 852 | +{ return 0; } | |
| 861 | 853 | |
| 862 | 854 | #endif |
| 863 | 855 | |
| @@ -26,6 +26,8 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/msi.h> |
| 27 | 27 | #include <linux/irqreturn.h> |
| 28 | 28 | |
| 29 | +struct acpi_dmar_header; | |
| 30 | + | |
| 29 | 31 | /* DMAR Flags */ |
| 30 | 32 | #define DMAR_INTR_REMAP 0x1 |
| 31 | 33 | #define DMAR_X2APIC_OPT_OUT 0x2 |
| @@ -37,22 +37,21 @@ int ddebug_add_module(struct _ddebug *tab, unsigned int n, · 36 unmodified lines | ||
| 37 | 37 | |
| 38 | 38 | #if defined(CONFIG_DYNAMIC_DEBUG) |
| 39 | 39 | extern int ddebug_remove_module(const char *mod_name); |
| 40 | −extern int __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...) | |
| 41 | − __attribute__ ((format (printf, 2, 3))); | |
| 40 | +extern __printf(2, 3) | |
| 41 | +int __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...); | |
| 42 | 42 | |
| 43 | 43 | struct device; |
| 44 | 44 | |
| 45 | −extern int __dynamic_dev_dbg(struct _ddebug *descriptor, | |
| 46 | − const struct device *dev, | |
| 47 | − const char *fmt, ...) | |
| 48 | − __attribute__ ((format (printf, 3, 4))); | |
| 45 | +extern __printf(3, 4) | |
| 46 | +int __dynamic_dev_dbg(struct _ddebug *descriptor, const struct device *dev, | |
| 47 | + const char *fmt, ...); | |
| 49 | 48 | |
| 50 | 49 | struct net_device; |
| 51 | 50 | |
| 52 | −extern int __dynamic_netdev_dbg(struct _ddebug *descriptor, | |
| 53 | − const struct net_device *dev, | |
| 54 | − const char *fmt, ...) | |
| 55 | − __attribute__ ((format (printf, 3, 4))); | |
| 51 | +extern __printf(3, 4) | |
| 52 | +int __dynamic_netdev_dbg(struct _ddebug *descriptor, | |
| 53 | + const struct net_device *dev, | |
| 54 | + const char *fmt, ...); | |
| 56 | 55 | |
| 57 | 56 | #define DEFINE_DYNAMIC_DEBUG_METADATA(name, fmt) \ |
| 58 | 57 | static struct _ddebug __used __aligned(8) \ |
| @@ -937,15 +937,15 @@ extern int ext3_group_extend(struct super_block *sb, · 936 unmodified lines | ||
| 937 | 937 | ext3_fsblk_t n_blocks_count); |
| 938 | 938 | |
| 939 | 939 | /* super.c */ |
| 940 | −extern void ext3_error (struct super_block *, const char *, const char *, ...) | |
| 941 | − __attribute__ ((format (printf, 3, 4))); | |
| 940 | +extern __printf(3, 4) | |
| 941 | +void ext3_error(struct super_block *, const char *, const char *, ...); | |
| 942 | 942 | extern void __ext3_std_error (struct super_block *, const char *, int); |
| 943 | −extern void ext3_abort (struct super_block *, const char *, const char *, ...) | |
| 944 | − __attribute__ ((format (printf, 3, 4))); | |
| 945 | −extern void ext3_warning (struct super_block *, const char *, const char *, ...) | |
| 946 | − __attribute__ ((format (printf, 3, 4))); | |
| 947 | −extern void ext3_msg(struct super_block *, const char *, const char *, ...) | |
| 948 | − __attribute__ ((format (printf, 3, 4))); | |
| 943 | +extern __printf(3, 4) | |
| 944 | +void ext3_abort(struct super_block *, const char *, const char *, ...); | |
| 945 | +extern __printf(3, 4) | |
| 946 | +void ext3_warning(struct super_block *, const char *, const char *, ...); | |
| 947 | +extern __printf(3, 4) | |
| 948 | +void ext3_msg(struct super_block *, const char *, const char *, ...); | |
| 949 | 949 | extern void ext3_update_dynamic_rev (struct super_block *sb); |
| 950 | 950 | |
| 951 | 951 | #define ext3_std_error(sb, errno) \ |
| @@ -1633,9 +1633,10 @@ struct inode_operations { · 1632 unmodified lines | ||
| 1633 | 1633 | struct seq_file; |
| 1634 | 1634 | |
| 1635 | 1635 | ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector, |
| 1636 | − unsigned long nr_segs, unsigned long fast_segs, | |
| 1637 | − struct iovec *fast_pointer, | |
| 1638 | − struct iovec **ret_pointer); | |
| 1636 | + unsigned long nr_segs, unsigned long fast_segs, | |
| 1637 | + struct iovec *fast_pointer, | |
| 1638 | + struct iovec **ret_pointer, | |
| 1639 | + int check_access); | |
| 1639 | 1640 | |
| 1640 | 1641 | extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *); |
| 1641 | 1642 | extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *); |
| @@ -2634,8 +2635,8 @@ static const struct file_operations __fops = { \ · 992 unmodified lines | ||
| 2634 | 2635 | .llseek = generic_file_llseek, \ |
| 2635 | 2636 | }; |
| 2636 | 2637 | |
| 2637 | −static inline void __attribute__((format(printf, 1, 2))) | |
| 2638 | −__simple_attr_check_format(const char *fmt, ...) | |
| 2638 | +static inline __printf(1, 2) | |
| 2639 | +void __simple_attr_check_format(const char *fmt, ...) | |
| 2639 | 2640 | { |
| 2640 | 2641 | /* don't do anything, just let the compiler check the arguments; */ |
| 2641 | 2642 | } |
| @@ -492,10 +492,10 @@ static inline void fscache_end_io(struct fscache_retrieval *op, · 491 unmodified lines | ||
| 492 | 492 | /* |
| 493 | 493 | * out-of-line cache backend functions |
| 494 | 494 | */ |
| 495 | −extern void fscache_init_cache(struct fscache_cache *cache, | |
| 496 | − const struct fscache_cache_ops *ops, | |
| 497 | − const char *idfmt, | |
| 498 | − ...) __attribute__ ((format (printf, 3, 4))); | |
| 495 | +extern __printf(3, 4) | |
| 496 | +void fscache_init_cache(struct fscache_cache *cache, | |
| 497 | + const struct fscache_cache_ops *ops, | |
| 498 | + const char *idfmt, ...); | |
| 499 | 499 | |
| 500 | 500 | extern int fscache_add_cache(struct fscache_cache *cache, |
| 501 | 501 | struct fscache_object *fsdef, |
| @@ -78,8 +78,8 @@ static inline void gameport_register_port(struct gameport *gameport) · 77 unmodified lines | ||
| 78 | 78 | |
| 79 | 79 | void gameport_unregister_port(struct gameport *gameport); |
| 80 | 80 | |
| 81 | −void gameport_set_phys(struct gameport *gameport, const char *fmt, ...) | |
| 82 | − __attribute__ ((format (printf, 2, 3))); | |
| 81 | +__printf(2, 3) | |
| 82 | +void gameport_set_phys(struct gameport *gameport, const char *fmt, ...); | |
| 83 | 83 | |
| 84 | 84 | #else |
| 85 | 85 | |
| @@ -93,8 +93,8 @@ static inline void gameport_unregister_port(struct gameport *gameport) · 7 unmodified lines | ||
| 93 | 93 | return; |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | −static inline void gameport_set_phys(struct gameport *gameport, | |
| 97 | − const char *fmt, ...) | |
| 96 | +static inline __printf(2, 3) | |
| 97 | +void gameport_set_phys(struct gameport *gameport, const char *fmt, ...) | |
| 98 | 98 | { |
| 99 | 99 | return; |
| 100 | 100 | } |
| @@ -22,6 +22,11 @@ extern int zap_huge_pmd(struct mmu_gather *tlb, · 21 unmodified lines | ||
| 22 | 22 | extern int mincore_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, |
| 23 | 23 | unsigned long addr, unsigned long end, |
| 24 | 24 | unsigned char *vec); |
| 25 | +extern int move_huge_pmd(struct vm_area_struct *vma, | |
| 26 | + struct vm_area_struct *new_vma, | |
| 27 | + unsigned long old_addr, | |
| 28 | + unsigned long new_addr, unsigned long old_end, | |
| 29 | + pmd_t *old_pmd, pmd_t *new_pmd); | |
| 25 | 30 | extern int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, |
| 26 | 31 | unsigned long addr, pgprot_t newprot); |
| 27 | 32 | |
| @@ -101,9 +101,8 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u · 100 unmodified lines | ||
| 101 | 101 | #endif /*CONFIG_KALLSYMS*/ |
| 102 | 102 | |
| 103 | 103 | /* This macro allows us to keep printk typechecking */ |
| 104 | −static void __check_printsym_format(const char *fmt, ...) | |
| 105 | −__attribute__((format(printf,1,2))); | |
| 106 | −static inline void __check_printsym_format(const char *fmt, ...) | |
| 104 | +static __printf(1, 2) | |
| 105 | +void __check_printsym_format(const char *fmt, ...) | |
| 107 | 106 | { |
| 108 | 107 | } |
| 109 | 108 | |
| @@ -114,12 +114,9 @@ typedef enum { · 113 unmodified lines | ||
| 114 | 114 | } kdb_reason_t; |
| 115 | 115 | |
| 116 | 116 | extern int kdb_trap_printk; |
| 117 | −extern int vkdb_printf(const char *fmt, va_list args) | |
| 118 | − __attribute__ ((format (printf, 1, 0))); | |
| 119 | −extern int kdb_printf(const char *, ...) | |
| 120 | − __attribute__ ((format (printf, 1, 2))); | |
| 121 | −typedef int (*kdb_printf_t)(const char *, ...) | |
| 122 | − __attribute__ ((format (printf, 1, 2))); | |
| 117 | +extern __printf(1, 0) int vkdb_printf(const char *fmt, va_list args); | |
| 118 | +extern __printf(1, 2) int kdb_printf(const char *, ...); | |
| 119 | +typedef __printf(1, 2) int (*kdb_printf_t)(const char *, ...); | |
| 123 | 120 | |
| 124 | 121 | extern void kdb_init(int level); |
| 125 | 122 | |
| @@ -287,6 +287,8 @@ static inline int __must_check kstrtos32_from_user(const char __user *s, size_t · 286 unmodified lines | ||
| 287 | 287 | return kstrtoint_from_user(s, count, base, res); |
| 288 | 288 | } |
| 289 | 289 | |
| 290 | +/* Obsolete, do not use. Use kstrto<foo> instead */ | |
| 291 | + | |
| 290 | 292 | extern unsigned long simple_strtoul(const char *,char **,unsigned int); |
| 291 | 293 | extern long simple_strtol(const char *,char **,unsigned int); |
| 292 | 294 | extern unsigned long long simple_strtoull(const char *,char **,unsigned int); |
| @@ -296,20 +298,20 @@ extern long long simple_strtoll(const char *,char **,unsigned int); · 3 unmodified lines | ||
| 296 | 298 | #define strict_strtoull kstrtoull |
| 297 | 299 | #define strict_strtoll kstrtoll |
| 298 | 300 | |
| 299 | −extern int sprintf(char * buf, const char * fmt, ...) | |
| 300 | − __attribute__ ((format (printf, 2, 3))); | |
| 301 | −extern int vsprintf(char *buf, const char *, va_list) | |
| 302 | − __attribute__ ((format (printf, 2, 0))); | |
| 303 | −extern int snprintf(char * buf, size_t size, const char * fmt, ...) | |
| 304 | − __attribute__ ((format (printf, 3, 4))); | |
| 305 | −extern int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) | |
| 306 | − __attribute__ ((format (printf, 3, 0))); | |
| 307 | −extern int scnprintf(char * buf, size_t size, const char * fmt, ...) | |
| 308 | − __attribute__ ((format (printf, 3, 4))); | |
| 309 | −extern int vscnprintf(char *buf, size_t size, const char *fmt, va_list args) | |
| 310 | − __attribute__ ((format (printf, 3, 0))); | |
| 311 | −extern char *kasprintf(gfp_t gfp, const char *fmt, ...) | |
| 312 | − __attribute__ ((format (printf, 2, 3))); | |
| 301 | +/* lib/printf utilities */ | |
| 302 | + | |
| 303 | +extern __printf(2, 3) int sprintf(char *buf, const char * fmt, ...); | |
| 304 | +extern __printf(2, 0) int vsprintf(char *buf, const char *, va_list); | |
| 305 | +extern __printf(3, 4) | |
| 306 | +int snprintf(char *buf, size_t size, const char *fmt, ...); | |
| 307 | +extern __printf(3, 0) | |
| 308 | +int vsnprintf(char *buf, size_t size, const char *fmt, va_list args); | |
| 309 | +extern __printf(3, 4) | |
| 310 | +int scnprintf(char *buf, size_t size, const char *fmt, ...); | |
| 311 | +extern __printf(3, 0) | |
| 312 | +int vscnprintf(char *buf, size_t size, const char *fmt, va_list args); | |
| 313 | +extern __printf(2, 3) | |
| 314 | +char *kasprintf(gfp_t gfp, const char *fmt, ...); | |
| 313 | 315 | extern char *kvasprintf(gfp_t gfp, const char *fmt, va_list args); |
| 314 | 316 | |
| 315 | 317 | extern int sscanf(const char *, const char *, ...) |
| @@ -374,13 +376,18 @@ extern const char hex_asc[]; · 58 unmodified lines | ||
| 374 | 376 | #define hex_asc_lo(x) hex_asc[((x) & 0x0f)] |
| 375 | 377 | #define hex_asc_hi(x) hex_asc[((x) & 0xf0) >> 4] |
| 376 | 378 | |
| 377 | −static inline char *pack_hex_byte(char *buf, u8 byte) | |
| 379 | +static inline char *hex_byte_pack(char *buf, u8 byte) | |
| 378 | 380 | { |
| 379 | 381 | *buf++ = hex_asc_hi(byte); |
| 380 | 382 | *buf++ = hex_asc_lo(byte); |
| 381 | 383 | return buf; |
| 382 | 384 | } |
| 383 | 385 | |
| 386 | +static inline char * __deprecated pack_hex_byte(char *buf, u8 byte) | |
| 387 | +{ | |
| 388 | + return hex_byte_pack(buf, byte); | |
| 389 | +} | |
| 390 | + | |
| 384 | 391 | extern int hex_to_bin(char ch); |
| 385 | 392 | extern int __must_check hex2bin(u8 *dst, const char *src, size_t count); |
| 386 | 393 | |
| @@ -427,8 +434,8 @@ extern void tracing_start(void); · 40 unmodified lines | ||
| 427 | 434 | extern void tracing_stop(void); |
| 428 | 435 | extern void ftrace_off_permanent(void); |
| 429 | 436 | |
| 430 | −static inline void __attribute__ ((format (printf, 1, 2))) | |
| 431 | −____trace_printk_check_format(const char *fmt, ...) | |
| 437 | +static inline __printf(1, 2) | |
| 438 | +void ____trace_printk_check_format(const char *fmt, ...) | |
| 432 | 439 | { |
| 433 | 440 | } |
| 434 | 441 | #define __trace_printk_check_format(fmt, args...) \ |
| @@ -467,13 +474,11 @@ do { \ · 32 unmodified lines | ||
| 467 | 474 | __trace_printk(_THIS_IP_, fmt, ##args); \ |
| 468 | 475 | } while (0) |
| 469 | 476 | |
| 470 | −extern int | |
| 471 | −__trace_bprintk(unsigned long ip, const char *fmt, ...) | |
| 472 | − __attribute__ ((format (printf, 2, 3))); | |
| 477 | +extern __printf(2, 3) | |
| 478 | +int __trace_bprintk(unsigned long ip, const char *fmt, ...); | |
| 473 | 479 | |
| 474 | −extern int | |
| 475 | −__trace_printk(unsigned long ip, const char *fmt, ...) | |
| 476 | − __attribute__ ((format (printf, 2, 3))); | |
| 480 | +extern __printf(2, 3) | |
| 481 | +int __trace_printk(unsigned long ip, const char *fmt, ...); | |
| 477 | 482 | |
| 478 | 483 | extern void trace_dump_stack(void); |
| 479 | 484 | |
| @@ -502,8 +507,8 @@ __ftrace_vprintk(unsigned long ip, const char *fmt, va_list ap); · 22 unmodified lines | ||
| 502 | 507 | |
| 503 | 508 | extern void ftrace_dump(enum ftrace_dump_mode oops_dump_mode); |
| 504 | 509 | #else |
| 505 | −static inline int | |
| 506 | −trace_printk(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); | |
| 510 | +static inline __printf(1, 2) | |
| 511 | +int trace_printk(const char *fmt, ...); | |
| 507 | 512 | |
| 508 | 513 | static inline void tracing_start(void) { } |
| 509 | 514 | static inline void tracing_stop(void) { } |
| @@ -140,8 +140,8 @@ void crash_save_vmcoreinfo(void); · 139 unmodified lines | ||
| 140 | 140 | void crash_map_reserved_pages(void); |
| 141 | 141 | void crash_unmap_reserved_pages(void); |
| 142 | 142 | void arch_crash_save_vmcoreinfo(void); |
| 143 | −void vmcoreinfo_append_str(const char *fmt, ...) | |
| 144 | − __attribute__ ((format (printf, 1, 2))); | |
| 143 | +__printf(1, 2) | |
| 144 | +void vmcoreinfo_append_str(const char *fmt, ...); | |
| 145 | 145 | unsigned long paddr_vmcoreinfo_note(void); |
| 146 | 146 | |
| 147 | 147 | #define VMCOREINFO_OSRELEASE(value) \ |
| @@ -32,8 +32,8 @@ · 31 unmodified lines | ||
| 32 | 32 | extern char modprobe_path[]; /* for sysctl */ |
| 33 | 33 | /* modprobe exit status on success, -ve on error. Return value |
| 34 | 34 | * usually useless though. */ |
| 35 | −extern int __request_module(bool wait, const char *name, ...) \ | |
| 36 | − __attribute__((format(printf, 2, 3))); | |
| 35 | +extern __printf(2, 3) | |
| 36 | +int __request_module(bool wait, const char *name, ...); | |
| 37 | 37 | #define request_module(mod...) __request_module(true, mod) |
| 38 | 38 | #define request_module_nowait(mod...) __request_module(false, mod) |
| 39 | 39 | #define try_then_request_module(x, mod...) \ |
| @@ -72,8 +72,8 @@ struct kobject { · 71 unmodified lines | ||
| 72 | 72 | unsigned int uevent_suppress:1; |
| 73 | 73 | }; |
| 74 | 74 | |
| 75 | −extern int kobject_set_name(struct kobject *kobj, const char *name, ...) | |
| 76 | − __attribute__((format(printf, 2, 3))); | |
| 75 | +extern __printf(2, 3) | |
| 76 | +int kobject_set_name(struct kobject *kobj, const char *name, ...); | |
| 77 | 77 | extern int kobject_set_name_vargs(struct kobject *kobj, const char *fmt, |
| 78 | 78 | va_list vargs); |
| 79 | 79 | |
| @@ -83,15 +83,13 @@ static inline const char *kobject_name(const struct kobject *kobj) · 3 unmodified lines | ||
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | extern void kobject_init(struct kobject *kobj, struct kobj_type *ktype); |
| 86 | −extern int __must_check kobject_add(struct kobject *kobj, | |
| 87 | − struct kobject *parent, | |
| 88 | − const char *fmt, ...) | |
| 89 | − __attribute__((format(printf, 3, 4))); | |
| 90 | −extern int __must_check kobject_init_and_add(struct kobject *kobj, | |
| 91 | − struct kobj_type *ktype, | |
| 92 | − struct kobject *parent, | |
| 93 | − const char *fmt, ...) | |
| 94 | − __attribute__((format(printf, 4, 5))); | |
| 86 | +extern __printf(3, 4) __must_check | |
| 87 | +int kobject_add(struct kobject *kobj, struct kobject *parent, | |
| 88 | + const char *fmt, ...); | |
| 89 | +extern __printf(4, 5) __must_check | |
| 90 | +int kobject_init_and_add(struct kobject *kobj, | |
| 91 | + struct kobj_type *ktype, struct kobject *parent, | |
| 92 | + const char *fmt, ...); | |
| 95 | 93 | |
| 96 | 94 | extern void kobject_del(struct kobject *kobj); |
| 97 | 95 | |
| @@ -212,8 +210,8 @@ int kobject_uevent(struct kobject *kobj, enum kobject_action action); · 114 unmodified lines | ||
| 212 | 210 | int kobject_uevent_env(struct kobject *kobj, enum kobject_action action, |
| 213 | 211 | char *envp[]); |
| 214 | 212 | |
| 215 | −int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...) | |
| 216 | − __attribute__((format (printf, 2, 3))); | |
| 213 | +__printf(2, 3) | |
| 214 | +int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...); | |
| 217 | 215 | |
| 218 | 216 | int kobject_action_type(const char *buf, size_t count, |
| 219 | 217 | enum kobject_action *type); |
| @@ -226,7 +224,7 @@ static inline int kobject_uevent_env(struct kobject *kobj, · 6 unmodified lines | ||
| 226 | 224 | char *envp[]) |
| 227 | 225 | { return 0; } |
| 228 | 226 | |
| 229 | −static inline __attribute__((format(printf, 2, 3))) | |
| 227 | +static inline __printf(2, 3) | |
| 230 | 228 | int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...) |
| 231 | 229 | { return 0; } |
| 232 | 230 | |
| @@ -4,11 +4,11 @@ · 3 unmodified lines | ||
| 4 | 4 | #include <linux/err.h> |
| 5 | 5 | #include <linux/sched.h> |
| 6 | 6 | |
| 7 | +__printf(4, 5) | |
| 7 | 8 | struct task_struct *kthread_create_on_node(int (*threadfn)(void *data), |
| 8 | 9 | void *data, |
| 9 | 10 | int node, |
| 10 | − const char namefmt[], ...) | |
| 11 | − __attribute__((format(printf, 4, 5))); | |
| 11 | + const char namefmt[], ...); | |
| 12 | 12 | |
| 13 | 13 | #define kthread_create(threadfn, data, namefmt, arg...) \ |
| 14 | 14 | kthread_create_on_node(threadfn, data, -1, namefmt, ##arg) |
| @@ -1256,13 +1256,13 @@ static inline int sata_srst_pmp(struct ata_link *link) · 1255 unmodified lines | ||
| 1256 | 1256 | /* |
| 1257 | 1257 | * printk helpers |
| 1258 | 1258 | */ |
| 1259 | −__attribute__((format (printf, 3, 4))) | |
| 1259 | +__printf(3, 4) | |
| 1260 | 1260 | int ata_port_printk(const struct ata_port *ap, const char *level, |
| 1261 | 1261 | const char *fmt, ...); |
| 1262 | −__attribute__((format (printf, 3, 4))) | |
| 1262 | +__printf(3, 4) | |
| 1263 | 1263 | int ata_link_printk(const struct ata_link *link, const char *level, |
| 1264 | 1264 | const char *fmt, ...); |
| 1265 | −__attribute__((format (printf, 3, 4))) | |
| 1265 | +__printf(3, 4) | |
| 1266 | 1266 | int ata_dev_printk(const struct ata_device *dev, const char *level, |
| 1267 | 1267 | const char *fmt, ...); |
| 1268 | 1268 | |
| @@ -1304,10 +1304,10 @@ void ata_print_version(const struct device *dev, const char *version); · 35 unmodified lines | ||
| 1304 | 1304 | /* |
| 1305 | 1305 | * ata_eh_info helpers |
| 1306 | 1306 | */ |
| 1307 | −extern void __ata_ehi_push_desc(struct ata_eh_info *ehi, const char *fmt, ...) | |
| 1308 | − __attribute__ ((format (printf, 2, 3))); | |
| 1309 | −extern void ata_ehi_push_desc(struct ata_eh_info *ehi, const char *fmt, ...) | |
| 1310 | − __attribute__ ((format (printf, 2, 3))); | |
| 1307 | +extern __printf(2, 3) | |
| 1308 | +void __ata_ehi_push_desc(struct ata_eh_info *ehi, const char *fmt, ...); | |
| 1309 | +extern __printf(2, 3) | |
| 1310 | +void ata_ehi_push_desc(struct ata_eh_info *ehi, const char *fmt, ...); | |
| 1311 | 1311 | extern void ata_ehi_clear_desc(struct ata_eh_info *ehi); |
| 1312 | 1312 | |
| 1313 | 1313 | static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi) |
| @@ -1321,8 +1321,8 @@ static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi) · 7 unmodified lines | ||
| 1321 | 1321 | /* |
| 1322 | 1322 | * port description helpers |
| 1323 | 1323 | */ |
| 1324 | −extern void ata_port_desc(struct ata_port *ap, const char *fmt, ...) | |
| 1325 | − __attribute__ ((format (printf, 2, 3))); | |
| 1324 | +extern __printf(2, 3) | |
| 1325 | +void ata_port_desc(struct ata_port *ap, const char *fmt, ...); | |
| 1326 | 1326 | #ifdef CONFIG_PCI |
| 1327 | 1327 | extern void ata_port_pbar_desc(struct ata_port *ap, int bar, ssize_t offset, |
| 1328 | 1328 | const char *name); |
| @@ -113,7 +113,6 @@ struct lis3lv02d_platform_data { · 112 unmodified lines | ||
| 113 | 113 | s8 axis_x; |
| 114 | 114 | s8 axis_y; |
| 115 | 115 | s8 axis_z; |
| 116 | −#define LIS3_USE_REGULATOR_CTRL 0x01 | |
| 117 | 116 | #define LIS3_USE_BLOCK_READ 0x02 |
| 118 | 117 | u16 driver_features; |
| 119 | 118 | int default_rate; |
| @@ -148,7 +148,7 @@ static inline struct llist_node *llist_next(struct llist_node *node) · 147 unmodified lines | ||
| 148 | 148 | * @new: new entry to be added |
| 149 | 149 | * @head: the head for your lock-less list |
| 150 | 150 | * |
| 151 | − * Return whether list is empty before adding. | |
| 151 | + * Returns true if the list was empty prior to adding this entry. | |
| 152 | 152 | */ |
| 153 | 153 | static inline bool llist_add(struct llist_node *new, struct llist_head *head) |
| 154 | 154 | { |
| @@ -80,6 +80,7 @@ extern phys_addr_t __memblock_alloc_base(phys_addr_t size, · 79 unmodified lines | ||
| 80 | 80 | phys_addr_t align, |
| 81 | 81 | phys_addr_t max_addr); |
| 82 | 82 | extern phys_addr_t memblock_phys_mem_size(void); |
| 83 | +extern phys_addr_t memblock_start_of_DRAM(void); | |
| 83 | 84 | extern phys_addr_t memblock_end_of_DRAM(void); |
| 84 | 85 | extern void memblock_enforce_memory_limit(phys_addr_t memory_limit); |
| 85 | 86 | extern int memblock_is_memory(phys_addr_t addr); |
| @@ -35,7 +35,8 @@ enum mem_cgroup_page_stat_item { · 34 unmodified lines | ||
| 35 | 35 | extern unsigned long mem_cgroup_isolate_pages(unsigned long nr_to_scan, |
| 36 | 36 | struct list_head *dst, |
| 37 | 37 | unsigned long *scanned, int order, |
| 38 | − int mode, struct zone *z, | |
| 38 | + isolate_mode_t mode, | |
| 39 | + struct zone *z, | |
| 39 | 40 | struct mem_cgroup *mem_cont, |
| 40 | 41 | int active, int file); |
| 41 | 42 | |
| @@ -1334,7 +1334,8 @@ extern void si_meminfo(struct sysinfo * val); · 1333 unmodified lines | ||
| 1334 | 1334 | extern void si_meminfo_node(struct sysinfo *val, int nid); |
| 1335 | 1335 | extern int after_bootmem; |
| 1336 | 1336 | |
| 1337 | −extern void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...); | |
| 1337 | +extern __printf(3, 4) | |
| 1338 | +void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...); | |
| 1338 | 1339 | |
| 1339 | 1340 | extern void setup_per_cpu_pageset(void); |
| 1340 | 1341 | |
| @@ -304,8 +304,15 @@ struct mm_struct { · 303 unmodified lines | ||
| 304 | 304 | unsigned long hiwater_rss; /* High-watermark of RSS usage */ |
| 305 | 305 | unsigned long hiwater_vm; /* High-water virtual memory usage */ |
| 306 | 306 | |
| 307 | − unsigned long total_vm, locked_vm, shared_vm, exec_vm; | |
| 308 | − unsigned long stack_vm, reserved_vm, def_flags, nr_ptes; | |
| 307 | + unsigned long total_vm; /* Total pages mapped */ | |
| 308 | + unsigned long locked_vm; /* Pages that have PG_mlocked set */ | |
| 309 | + unsigned long pinned_vm; /* Refcount permanently increased */ | |
| 310 | + unsigned long shared_vm; /* Shared pages (files) */ | |
| 311 | + unsigned long exec_vm; /* VM_EXEC & ~VM_WRITE */ | |
| 312 | + unsigned long stack_vm; /* VM_GROWSUP/DOWN */ | |
| 313 | + unsigned long reserved_vm; /* VM_RESERVED|VM_IO pages */ | |
| 314 | + unsigned long def_flags; | |
| 315 | + unsigned long nr_ptes; /* Page table pages */ | |
| 309 | 316 | unsigned long start_code, end_code, start_data, end_data; |
| 310 | 317 | unsigned long start_brk, brk, start_stack; |
| 311 | 318 | unsigned long arg_start, arg_end, env_start, env_end; |
| @@ -336,9 +343,6 @@ struct mm_struct { · 24 unmodified lines | ||
| 336 | 343 | unsigned int token_priority; |
| 337 | 344 | unsigned int last_interval; |
| 338 | 345 | |
| 339 | − /* How many tasks sharing this mm are OOM_DISABLE */ | |
| 340 | − atomic_t oom_disable_count; | |
| 341 | − | |
| 342 | 346 | unsigned long flags; /* Must use atomic bitops to access the bits */ |
| 343 | 347 | |
| 344 | 348 | struct core_state *core_state; /* coredumping support */ |
| @@ -49,8 +49,7 @@ extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size, · 48 unmodified lines | ||
| 49 | 49 | extern void mmiotrace_iounmap(volatile void __iomem *addr); |
| 50 | 50 | |
| 51 | 51 | /* For anyone to insert markers. Remember trailing newline. */ |
| 52 | −extern int mmiotrace_printk(const char *fmt, ...) | |
| 53 | − __attribute__ ((format (printf, 1, 2))); | |
| 52 | +extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...); | |
| 54 | 53 | #else /* !CONFIG_MMIOTRACE: */ |
| 55 | 54 | static inline int is_kmmio_active(void) |
| 56 | 55 | { |
| @@ -71,10 +70,7 @@ static inline void mmiotrace_iounmap(volatile void __iomem *addr) · 14 unmodified lines | ||
| 71 | 70 | { |
| 72 | 71 | } |
| 73 | 72 | |
| 74 | −static inline int mmiotrace_printk(const char *fmt, ...) | |
| 75 | − __attribute__ ((format (printf, 1, 0))); | |
| 76 | − | |
| 77 | −static inline int mmiotrace_printk(const char *fmt, ...) | |
| 73 | +static inline __printf(1, 2) int mmiotrace_printk(const char *fmt, ...) | |
| 78 | 74 | { |
| 79 | 75 | return 0; |
| 80 | 76 | } |
| @@ -100,6 +100,7 @@ enum zone_stat_item { · 99 unmodified lines | ||
| 100 | 100 | NR_UNSTABLE_NFS, /* NFS unstable pages */ |
| 101 | 101 | NR_BOUNCE, |
| 102 | 102 | NR_VMSCAN_WRITE, |
| 103 | + NR_VMSCAN_IMMEDIATE, /* Prioritise for reclaim when writeback ends */ | |
| 103 | 104 | NR_WRITEBACK_TEMP, /* Writeback using temporary buffers */ |
| 104 | 105 | NR_ISOLATED_ANON, /* Temporary isolated pages from anon lru */ |
| 105 | 106 | NR_ISOLATED_FILE, /* Temporary isolated pages from file lru */ |
| @@ -164,6 +165,18 @@ static inline int is_unevictable_lru(enum lru_list l) · 58 unmodified lines | ||
| 164 | 165 | #define LRU_ALL_EVICTABLE (LRU_ALL_FILE | LRU_ALL_ANON) |
| 165 | 166 | #define LRU_ALL ((1 << NR_LRU_LISTS) - 1) |
| 166 | 167 | |
| 168 | +/* Isolate inactive pages */ | |
| 169 | +#define ISOLATE_INACTIVE ((__force isolate_mode_t)0x1) | |
| 170 | +/* Isolate active pages */ | |
| 171 | +#define ISOLATE_ACTIVE ((__force isolate_mode_t)0x2) | |
| 172 | +/* Isolate clean file */ | |
| 173 | +#define ISOLATE_CLEAN ((__force isolate_mode_t)0x4) | |
| 174 | +/* Isolate unmapped file */ | |
| 175 | +#define ISOLATE_UNMAPPED ((__force isolate_mode_t)0x8) | |
| 176 | + | |
| 177 | +/* LRU Isolation modes. */ | |
| 178 | +typedef unsigned __bitwise__ isolate_mode_t; | |
| 179 | + | |
| 167 | 180 | enum zone_watermarks { |
| 168 | 181 | WMARK_MIN, |
| 169 | 182 | WMARK_LOW, |
| @@ -2622,23 +2622,23 @@ static inline const char *netdev_name(const struct net_device *dev) · 2621 unmodified lines | ||
| 2622 | 2622 | extern int __netdev_printk(const char *level, const struct net_device *dev, |
| 2623 | 2623 | struct va_format *vaf); |
| 2624 | 2624 | |
| 2625 | −extern int netdev_printk(const char *level, const struct net_device *dev, | |
| 2626 | − const char *format, ...) | |
| 2627 | − __attribute__ ((format (printf, 3, 4))); | |
| 2628 | −extern int netdev_emerg(const struct net_device *dev, const char *format, ...) | |
| 2629 | − __attribute__ ((format (printf, 2, 3))); | |
| 2630 | −extern int netdev_alert(const struct net_device *dev, const char *format, ...) | |
| 2631 | − __attribute__ ((format (printf, 2, 3))); | |
| 2632 | −extern int netdev_crit(const struct net_device *dev, const char *format, ...) | |
| 2633 | − __attribute__ ((format (printf, 2, 3))); | |
| 2634 | −extern int netdev_err(const struct net_device *dev, const char *format, ...) | |
| 2635 | − __attribute__ ((format (printf, 2, 3))); | |
| 2636 | −extern int netdev_warn(const struct net_device *dev, const char *format, ...) | |
| 2637 | − __attribute__ ((format (printf, 2, 3))); | |
| 2638 | −extern int netdev_notice(const struct net_device *dev, const char *format, ...) | |
| 2639 | − __attribute__ ((format (printf, 2, 3))); | |
| 2640 | −extern int netdev_info(const struct net_device *dev, const char *format, ...) | |
| 2641 | − __attribute__ ((format (printf, 2, 3))); | |
| 2625 | +extern __printf(3, 4) | |
| 2626 | +int netdev_printk(const char *level, const struct net_device *dev, | |
| 2627 | + const char *format, ...); | |
| 2628 | +extern __printf(2, 3) | |
| 2629 | +int netdev_emerg(const struct net_device *dev, const char *format, ...); | |
| 2630 | +extern __printf(2, 3) | |
| 2631 | +int netdev_alert(const struct net_device *dev, const char *format, ...); | |
| 2632 | +extern __printf(2, 3) | |
| 2633 | +int netdev_crit(const struct net_device *dev, const char *format, ...); | |
| 2634 | +extern __printf(2, 3) | |
| 2635 | +int netdev_err(const struct net_device *dev, const char *format, ...); | |
| 2636 | +extern __printf(2, 3) | |
| 2637 | +int netdev_warn(const struct net_device *dev, const char *format, ...); | |
| 2638 | +extern __printf(2, 3) | |
| 2639 | +int netdev_notice(const struct net_device *dev, const char *format, ...); | |
| 2640 | +extern __printf(2, 3) | |
| 2641 | +int netdev_info(const struct net_device *dev, const char *format, ...); | |
| 2642 | 2642 | |
| 2643 | 2643 | #define MODULE_ALIAS_NETDEV(device) \ |
| 2644 | 2644 | MODULE_ALIAS("netdev-" device) |
| @@ -40,6 +40,7 @@ enum oom_constraint { · 39 unmodified lines | ||
| 40 | 40 | CONSTRAINT_MEMCG, |
| 41 | 41 | }; |
| 42 | 42 | |
| 43 | +extern void compare_swap_oom_score_adj(int old_val, int new_val); | |
| 43 | 44 | extern int test_set_oom_score_adj(int new_val); |
| 44 | 45 | |
| 45 | 46 | extern unsigned int oom_badness(struct task_struct *p, struct mem_cgroup *mem, |
| @@ -0,0 +1,14 @@ | ||
| 1 | +#ifndef __LEDS_RENESAS_TPU_H__ | |
| 2 | +#define __LEDS_RENESAS_TPU_H__ | |
| 3 | + | |
| 4 | +struct led_renesas_tpu_config { | |
| 5 | + char *name; | |
| 6 | + unsigned pin_gpio_fn; | |
| 7 | + unsigned pin_gpio; | |
| 8 | + unsigned int channel_offset; | |
| 9 | + unsigned int timer_bit; | |
| 10 | + unsigned int max_brightness; | |
| 11 | + unsigned int refresh_rate; | |
| 12 | +}; | |
| 13 | + | |
| 14 | +#endif /* __LEDS_RENESAS_TPU_H__ */ | |
| @@ -82,22 +82,22 @@ struct va_format { · 81 unmodified lines | ||
| 82 | 82 | * Dummy printk for disabled debugging statements to use whilst maintaining |
| 83 | 83 | * gcc's format and side-effect checking. |
| 84 | 84 | */ |
| 85 | −static inline __attribute__ ((format (printf, 1, 2))) | |
| 85 | +static inline __printf(1, 2) | |
| 86 | 86 | int no_printk(const char *fmt, ...) |
| 87 | 87 | { |
| 88 | 88 | return 0; |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | −extern asmlinkage __attribute__ ((format (printf, 1, 2))) | |
| 91 | +extern asmlinkage __printf(1, 2) | |
| 92 | 92 | void early_printk(const char *fmt, ...); |
| 93 | 93 | |
| 94 | 94 | extern int printk_needs_cpu(int cpu); |
| 95 | 95 | extern void printk_tick(void); |
| 96 | 96 | |
| 97 | 97 | #ifdef CONFIG_PRINTK |
| 98 | −asmlinkage __attribute__ ((format (printf, 1, 0))) | |
| 98 | +asmlinkage __printf(1, 0) | |
| 99 | 99 | int vprintk(const char *fmt, va_list args); |
| 100 | −asmlinkage __attribute__ ((format (printf, 1, 2))) __cold | |
| 100 | +asmlinkage __printf(1, 2) __cold | |
| 101 | 101 | int printk(const char *fmt, ...); |
| 102 | 102 | |
| 103 | 103 | /* |
| @@ -117,12 +117,12 @@ extern int kptr_restrict; · 13 unmodified lines | ||
| 117 | 117 | void log_buf_kexec_setup(void); |
| 118 | 118 | void __init setup_log_buf(int early); |
| 119 | 119 | #else |
| 120 | −static inline __attribute__ ((format (printf, 1, 0))) | |
| 120 | +static inline __printf(1, 0) | |
| 121 | 121 | int vprintk(const char *s, va_list args) |
| 122 | 122 | { |
| 123 | 123 | return 0; |
| 124 | 124 | } |
| 125 | −static inline __attribute__ ((format (printf, 1, 2))) __cold | |
| 125 | +static inline __printf(1, 2) __cold | |
| 126 | 126 | int printk(const char *s, ...) |
| 127 | 127 | { |
| 128 | 128 | return 0; |
| @@ -31,7 +31,7 @@ static inline bool is_quota_modification(struct inode *inode, struct iattr *ia) · 30 unmodified lines | ||
| 31 | 31 | #define quota_error(sb, fmt, args...) \ |
| 32 | 32 | __quota_error((sb), __func__, fmt , ## args) |
| 33 | 33 | |
| 34 | −extern __attribute__((format (printf, 3, 4))) | |
| 34 | +extern __printf(3, 4) | |
| 35 | 35 | void __quota_error(struct super_block *sb, const char *func, |
| 36 | 36 | const char *fmt, ...); |
| 37 | 37 | |
| @@ -84,8 +84,7 @@ int seq_putc(struct seq_file *m, char c); · 83 unmodified lines | ||
| 84 | 84 | int seq_puts(struct seq_file *m, const char *s); |
| 85 | 85 | int seq_write(struct seq_file *seq, const void *data, size_t len); |
| 86 | 86 | |
| 87 | −int seq_printf(struct seq_file *, const char *, ...) | |
| 88 | − __attribute__ ((format (printf,2,3))); | |
| 87 | +__printf(2, 3) int seq_printf(struct seq_file *, const char *, ...); | |
| 89 | 88 | |
| 90 | 89 | int seq_path(struct seq_file *, struct path *, char *); |
| 91 | 90 | int seq_dentry(struct seq_file *, struct dentry *, char *); |
| @@ -20,6 +20,7 @@ struct shrink_control { · 19 unmodified lines | ||
| 20 | 20 | * 'nr_to_scan' entries and attempt to free them up. It should return |
| 21 | 21 | * the number of objects which remain in the cache. If it returns -1, it means |
| 22 | 22 | * it cannot do any scanning at this time (eg. there is a risk of deadlock). |
| 23 | + * The callback must not return -1 if nr_to_scan is zero. | |
| 23 | 24 | * |
| 24 | 25 | * The 'gfpmask' refers to the allocation we are currently trying to |
| 25 | 26 | * fulfil. |
| @@ -24,8 +24,6 @@ · 23 unmodified lines | ||
| 24 | 24 | struct l4f00242t03_pdata { |
| 25 | 25 | unsigned int reset_gpio; |
| 26 | 26 | unsigned int data_enable_gpio; |
| 27 | − const char *io_supply; /* will be set to 1.8 V */ | |
| 28 | − const char *core_supply; /* will be set to 2.8 V */ | |
| 29 | 27 | }; |
| 30 | 28 | |
| 31 | 29 | #endif /* _INCLUDE_LINUX_SPI_L4F00242T03_H_ */ |
| @@ -114,6 +114,7 @@ extern int memcmp(const void *,const void *,__kernel_size_t); · 113 unmodified lines | ||
| 114 | 114 | #ifndef __HAVE_ARCH_MEMCHR |
| 115 | 115 | extern void * memchr(const void *,int,__kernel_size_t); |
| 116 | 116 | #endif |
| 117 | +void *memchr_inv(const void *s, int c, size_t n); | |
| 117 | 118 | |
| 118 | 119 | extern char *kstrdup(const char *s, gfp_t gfp); |
| 119 | 120 | extern char *kstrndup(const char *s, size_t len, gfp_t gfp); |
| @@ -243,15 +243,10 @@ static inline void lru_cache_add_file(struct page *page) · 242 unmodified lines | ||
| 243 | 243 | __lru_cache_add(page, LRU_INACTIVE_FILE); |
| 244 | 244 | } |
| 245 | 245 | |
| 246 | −/* LRU Isolation modes. */ | |
| 247 | −#define ISOLATE_INACTIVE 0 /* Isolate inactive pages. */ | |
| 248 | −#define ISOLATE_ACTIVE 1 /* Isolate active pages. */ | |
| 249 | −#define ISOLATE_BOTH 2 /* Isolate both active and inactive pages. */ | |
| 250 | − | |
| 251 | 246 | /* linux/mm/vmscan.c */ |
| 252 | 247 | extern unsigned long try_to_free_pages(struct zonelist *zonelist, int order, |
| 253 | 248 | gfp_t gfp_mask, nodemask_t *mask); |
| 254 | −extern int __isolate_lru_page(struct page *page, int mode, int file); | |
| 249 | +extern int __isolate_lru_page(struct page *page, isolate_mode_t mode, int file); | |
| 255 | 250 | extern unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem, |
| 256 | 251 | gfp_t gfp_mask, bool noswap); |
| 257 | 252 | extern unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem, |
| @@ -844,4 +844,17 @@ asmlinkage long sys_open_by_handle_at(int mountdirfd, · 843 unmodified lines | ||
| 844 | 844 | struct file_handle __user *handle, |
| 845 | 845 | int flags); |
| 846 | 846 | asmlinkage long sys_setns(int fd, int nstype); |
| 847 | +asmlinkage long sys_process_vm_readv(pid_t pid, | |
| 848 | + const struct iovec __user *lvec, | |
| 849 | + unsigned long liovcnt, | |
| 850 | + const struct iovec __user *rvec, | |
| 851 | + unsigned long riovcnt, | |
| 852 | + unsigned long flags); | |
| 853 | +asmlinkage long sys_process_vm_writev(pid_t pid, | |
| 854 | + const struct iovec __user *lvec, | |
| 855 | + unsigned long liovcnt, | |
| 856 | + const struct iovec __user *rvec, | |
| 857 | + unsigned long riovcnt, | |
| 858 | + unsigned long flags); | |
| 859 | + | |
| 847 | 860 | #endif |
| @@ -29,10 +29,10 @@ trace_seq_init(struct trace_seq *s) · 28 unmodified lines | ||
| 29 | 29 | * Currently only defined when tracing is enabled. |
| 30 | 30 | */ |
| 31 | 31 | #ifdef CONFIG_TRACING |
| 32 | −extern int trace_seq_printf(struct trace_seq *s, const char *fmt, ...) | |
| 33 | − __attribute__ ((format (printf, 2, 3))); | |
| 34 | −extern int trace_seq_vprintf(struct trace_seq *s, const char *fmt, va_list args) | |
| 35 | − __attribute__ ((format (printf, 2, 0))); | |
| 32 | +extern __printf(2, 3) | |
| 33 | +int trace_seq_printf(struct trace_seq *s, const char *fmt, ...); | |
| 34 | +extern __printf(2, 0) | |
| 35 | +int trace_seq_vprintf(struct trace_seq *s, const char *fmt, va_list args); | |
| 36 | 36 | extern int |
| 37 | 37 | trace_seq_bprintf(struct trace_seq *s, const char *fmt, const u32 *binary); |
| 38 | 38 | extern int trace_print_seq(struct seq_file *m, struct trace_seq *s); |
| @@ -13,6 +13,7 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */ · 12 unmodified lines | ||
| 13 | 13 | #define VM_MAP 0x00000004 /* vmap()ed pages */ |
| 14 | 14 | #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ |
| 15 | 15 | #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */ |
| 16 | +#define VM_UNLIST 0x00000020 /* vm_struct is not listed in vmlist */ | |
| 16 | 17 | /* bits [20..32] reserved for arch specific ioremap internals */ |
| 17 | 18 | |
| 18 | 19 | /* |