Merge tags 'auxdisplay-for-linus-v5.9-rc4', 'clang-format-for-linus-v5.9-rc4' and 'compiler-attributes-for-linus-v5.9-rc4' of git://github.com/ojeda/linux
Pull misc fixes from Miguel Ojeda: "A trivial patch for auxdisplay: - Replace HTTP links with HTTPS ones (Alexander A. Klimov) The usual clang-format trivial update: - Update with the latest for_each macro list (Miguel Ojeda) And Luc requested me to pick a sparse fix on my queue, so here it goes along with other two trivial Compiler Attributes ones (also from Luc). - sparse: use static inline for __chk_{user,io}_ptr() (Luc Van Oostenryck) - Compiler Attributes: fix comment concerning GCC 4.6 (Luc Van Oostenryck) - Compiler Attributes: remove comment about sparse not supporting __has_attribute (Luc Van Oostenryck)" * tag 'auxdisplay-for-linus-v5.9-rc4' of git://github.com/ojeda/linux: auxdisplay: Replace HTTP links with HTTPS ones * tag 'clang-format-for-linus-v5.9-rc4' of git://github.com/ojeda/linux: clang-format: Update with the latest for_each macro list * tag 'compiler-attributes-for-linus-v5.9-rc4' of git://github.com/ojeda/linux: sparse: use static inline for __chk_{user,io}_ptr() Compiler Attributes: fix comment concerning GCC 4.6 Compiler Attributes: remove comment about sparse not supporting __has_attribute
This commit is contained in:
@ -111,6 +111,7 @@ ForEachMacros:
|
|||||||
- 'css_for_each_descendant_pre'
|
- 'css_for_each_descendant_pre'
|
||||||
- 'device_for_each_child_node'
|
- 'device_for_each_child_node'
|
||||||
- 'dma_fence_chain_for_each'
|
- 'dma_fence_chain_for_each'
|
||||||
|
- 'do_for_each_ftrace_op'
|
||||||
- 'drm_atomic_crtc_for_each_plane'
|
- 'drm_atomic_crtc_for_each_plane'
|
||||||
- 'drm_atomic_crtc_state_for_each_plane'
|
- 'drm_atomic_crtc_state_for_each_plane'
|
||||||
- 'drm_atomic_crtc_state_for_each_plane_state'
|
- 'drm_atomic_crtc_state_for_each_plane_state'
|
||||||
@ -136,6 +137,7 @@ ForEachMacros:
|
|||||||
- 'for_each_active_dev_scope'
|
- 'for_each_active_dev_scope'
|
||||||
- 'for_each_active_drhd_unit'
|
- 'for_each_active_drhd_unit'
|
||||||
- 'for_each_active_iommu'
|
- 'for_each_active_iommu'
|
||||||
|
- 'for_each_aggr_pgid'
|
||||||
- 'for_each_available_child_of_node'
|
- 'for_each_available_child_of_node'
|
||||||
- 'for_each_bio'
|
- 'for_each_bio'
|
||||||
- 'for_each_board_func_rsrc'
|
- 'for_each_board_func_rsrc'
|
||||||
@ -234,6 +236,7 @@ ForEachMacros:
|
|||||||
- 'for_each_node_state'
|
- 'for_each_node_state'
|
||||||
- 'for_each_node_with_cpus'
|
- 'for_each_node_with_cpus'
|
||||||
- 'for_each_node_with_property'
|
- 'for_each_node_with_property'
|
||||||
|
- 'for_each_nonreserved_multicast_dest_pgid'
|
||||||
- 'for_each_of_allnodes'
|
- 'for_each_of_allnodes'
|
||||||
- 'for_each_of_allnodes_from'
|
- 'for_each_of_allnodes_from'
|
||||||
- 'for_each_of_cpu_node'
|
- 'for_each_of_cpu_node'
|
||||||
@ -256,6 +259,7 @@ ForEachMacros:
|
|||||||
- 'for_each_pci_dev'
|
- 'for_each_pci_dev'
|
||||||
- 'for_each_pci_msi_entry'
|
- 'for_each_pci_msi_entry'
|
||||||
- 'for_each_pcm_streams'
|
- 'for_each_pcm_streams'
|
||||||
|
- 'for_each_physmem_range'
|
||||||
- 'for_each_populated_zone'
|
- 'for_each_populated_zone'
|
||||||
- 'for_each_possible_cpu'
|
- 'for_each_possible_cpu'
|
||||||
- 'for_each_present_cpu'
|
- 'for_each_present_cpu'
|
||||||
@ -265,6 +269,8 @@ ForEachMacros:
|
|||||||
- 'for_each_process_thread'
|
- 'for_each_process_thread'
|
||||||
- 'for_each_property_of_node'
|
- 'for_each_property_of_node'
|
||||||
- 'for_each_registered_fb'
|
- 'for_each_registered_fb'
|
||||||
|
- 'for_each_requested_gpio'
|
||||||
|
- 'for_each_requested_gpio_in_range'
|
||||||
- 'for_each_reserved_mem_region'
|
- 'for_each_reserved_mem_region'
|
||||||
- 'for_each_rtd_codec_dais'
|
- 'for_each_rtd_codec_dais'
|
||||||
- 'for_each_rtd_codec_dais_rollback'
|
- 'for_each_rtd_codec_dais_rollback'
|
||||||
@ -278,12 +284,17 @@ ForEachMacros:
|
|||||||
- 'for_each_sg'
|
- 'for_each_sg'
|
||||||
- 'for_each_sg_dma_page'
|
- 'for_each_sg_dma_page'
|
||||||
- 'for_each_sg_page'
|
- 'for_each_sg_page'
|
||||||
|
- 'for_each_sgtable_dma_page'
|
||||||
|
- 'for_each_sgtable_dma_sg'
|
||||||
|
- 'for_each_sgtable_page'
|
||||||
|
- 'for_each_sgtable_sg'
|
||||||
- 'for_each_sibling_event'
|
- 'for_each_sibling_event'
|
||||||
- 'for_each_subelement'
|
- 'for_each_subelement'
|
||||||
- 'for_each_subelement_extid'
|
- 'for_each_subelement_extid'
|
||||||
- 'for_each_subelement_id'
|
- 'for_each_subelement_id'
|
||||||
- '__for_each_thread'
|
- '__for_each_thread'
|
||||||
- 'for_each_thread'
|
- 'for_each_thread'
|
||||||
|
- 'for_each_unicast_dest_pgid'
|
||||||
- 'for_each_wakeup_source'
|
- 'for_each_wakeup_source'
|
||||||
- 'for_each_zone'
|
- 'for_each_zone'
|
||||||
- 'for_each_zone_zonelist'
|
- 'for_each_zone_zonelist'
|
||||||
@ -464,6 +475,7 @@ ForEachMacros:
|
|||||||
- 'v4l2_m2m_for_each_src_buf'
|
- 'v4l2_m2m_for_each_src_buf'
|
||||||
- 'v4l2_m2m_for_each_src_buf_safe'
|
- 'v4l2_m2m_for_each_src_buf_safe'
|
||||||
- 'virtio_device_for_each_vq'
|
- 'virtio_device_for_each_vq'
|
||||||
|
- 'while_for_each_ftrace_op'
|
||||||
- 'xa_for_each'
|
- 'xa_for_each'
|
||||||
- 'xa_for_each_marked'
|
- 'xa_for_each_marked'
|
||||||
- 'xa_for_each_range'
|
- 'xa_for_each_range'
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
/*
|
/*
|
||||||
* Driver for the on-board character LCD found on some ARM reference boards
|
* Driver for the on-board character LCD found on some ARM reference boards
|
||||||
* This is basically an Hitachi HD44780 LCD with a custom IP block to drive it
|
* This is basically an Hitachi HD44780 LCD with a custom IP block to drive it
|
||||||
* http://en.wikipedia.org/wiki/HD44780_Character_LCD
|
* https://en.wikipedia.org/wiki/HD44780_Character_LCD
|
||||||
* Currently it will just display the text "ARM Linux" and the linux version
|
* Currently it will just display the text "ARM Linux" and the linux version
|
||||||
*
|
*
|
||||||
* Author: Linus Walleij <triad@df.lth.se>
|
* Author: Linus Walleij <triad@df.lth.se>
|
||||||
|
@ -22,14 +22,8 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* __has_attribute is supported on gcc >= 5, clang >= 2.9 and icc >= 17.
|
* __has_attribute is supported on gcc >= 5, clang >= 2.9 and icc >= 17.
|
||||||
* In the meantime, to support 4.6 <= gcc < 5, we implement __has_attribute
|
* In the meantime, to support gcc < 5, we implement __has_attribute
|
||||||
* by hand.
|
* by hand.
|
||||||
*
|
|
||||||
* sparse does not support __has_attribute (yet) and defines __GNUC_MINOR__
|
|
||||||
* depending on the compiler used to build it; however, these attributes have
|
|
||||||
* no semantic effects for sparse, so it does not matter. Also note that,
|
|
||||||
* in order to avoid sparse's warnings, even the unsupported ones must be
|
|
||||||
* defined to 0.
|
|
||||||
*/
|
*/
|
||||||
#ifndef __has_attribute
|
#ifndef __has_attribute
|
||||||
# define __has_attribute(x) __GCC4_has_attribute_##x
|
# define __has_attribute(x) __GCC4_has_attribute_##x
|
||||||
|
@ -11,8 +11,8 @@
|
|||||||
# define __iomem __attribute__((noderef, address_space(__iomem)))
|
# define __iomem __attribute__((noderef, address_space(__iomem)))
|
||||||
# define __percpu __attribute__((noderef, address_space(__percpu)))
|
# define __percpu __attribute__((noderef, address_space(__percpu)))
|
||||||
# define __rcu __attribute__((noderef, address_space(__rcu)))
|
# define __rcu __attribute__((noderef, address_space(__rcu)))
|
||||||
extern void __chk_user_ptr(const volatile void __user *);
|
static inline void __chk_user_ptr(const volatile void __user *ptr) { }
|
||||||
extern void __chk_io_ptr(const volatile void __iomem *);
|
static inline void __chk_io_ptr(const volatile void __iomem *ptr) { }
|
||||||
/* context/locking */
|
/* context/locking */
|
||||||
# define __must_hold(x) __attribute__((context(x,1,1)))
|
# define __must_hold(x) __attribute__((context(x,1,1)))
|
||||||
# define __acquires(x) __attribute__((context(x,0,1)))
|
# define __acquires(x) __attribute__((context(x,0,1)))
|
||||||
|
Reference in New Issue
Block a user