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

Linus Torvalds 5 years ago dd9fb9bb 70187f77

+16 -10

4 changed files

expand all

.clang-format

drivers

auxdisplay

arm-charlcd.c

include

linux

compiler_attributes.h

compiler_types.h

+12

.clang-format

··· 111 111 - 'css_for_each_descendant_pre' 112 112 - 'device_for_each_child_node' 113 113 - 'dma_fence_chain_for_each' 114 + - 'do_for_each_ftrace_op' 114 115 - 'drm_atomic_crtc_for_each_plane' 115 116 - 'drm_atomic_crtc_state_for_each_plane' 116 117 - 'drm_atomic_crtc_state_for_each_plane_state' ··· 137 136 - 'for_each_active_dev_scope' 138 137 - 'for_each_active_drhd_unit' 139 138 - 'for_each_active_iommu' 139 + - 'for_each_aggr_pgid' 140 140 - 'for_each_available_child_of_node' 141 141 - 'for_each_bio' 142 142 - 'for_each_board_func_rsrc' ··· 236 234 - 'for_each_node_state' 237 235 - 'for_each_node_with_cpus' 238 236 - 'for_each_node_with_property' 237 + - 'for_each_nonreserved_multicast_dest_pgid' 239 238 - 'for_each_of_allnodes' 240 239 - 'for_each_of_allnodes_from' 241 240 - 'for_each_of_cpu_node' ··· 259 256 - 'for_each_pci_dev' 260 257 - 'for_each_pci_msi_entry' 261 258 - 'for_each_pcm_streams' 259 + - 'for_each_physmem_range' 262 260 - 'for_each_populated_zone' 263 261 - 'for_each_possible_cpu' 264 262 - 'for_each_present_cpu' ··· 269 265 - 'for_each_process_thread' 270 266 - 'for_each_property_of_node' 271 267 - 'for_each_registered_fb' 268 + - 'for_each_requested_gpio' 269 + - 'for_each_requested_gpio_in_range' 272 270 - 'for_each_reserved_mem_region' 273 271 - 'for_each_rtd_codec_dais' 274 272 - 'for_each_rtd_codec_dais_rollback' ··· 284 278 - 'for_each_sg' 285 279 - 'for_each_sg_dma_page' 286 280 - 'for_each_sg_page' 281 + - 'for_each_sgtable_dma_page' 282 + - 'for_each_sgtable_dma_sg' 283 + - 'for_each_sgtable_page' 284 + - 'for_each_sgtable_sg' 287 285 - 'for_each_sibling_event' 288 286 - 'for_each_subelement' 289 287 - 'for_each_subelement_extid' 290 288 - 'for_each_subelement_id' 291 289 - '__for_each_thread' 292 290 - 'for_each_thread' 291 + - 'for_each_unicast_dest_pgid' 293 292 - 'for_each_wakeup_source' 294 293 - 'for_each_zone' 295 294 - 'for_each_zone_zonelist' ··· 475 464 - 'v4l2_m2m_for_each_src_buf' 476 465 - 'v4l2_m2m_for_each_src_buf_safe' 477 466 - 'virtio_device_for_each_vq' 467 + - 'while_for_each_ftrace_op' 478 468 - 'xa_for_each' 479 469 - 'xa_for_each_marked' 480 470 - 'xa_for_each_range'

+1 -1

drivers/auxdisplay/arm-charlcd.c

··· 2 2 /* 3 3 * Driver for the on-board character LCD found on some ARM reference boards 4 4 * This is basically an Hitachi HD44780 LCD with a custom IP block to drive it 5 - * http://en.wikipedia.org/wiki/HD44780_Character_LCD 5 + * https://en.wikipedia.org/wiki/HD44780_Character_LCD 6 6 * Currently it will just display the text "ARM Linux" and the linux version 7 7 * 8 8 * Author: Linus Walleij <triad@df.lth.se>

+1 -7

include/linux/compiler_attributes.h

··· 22 22 23 23 /* 24 24 * __has_attribute is supported on gcc >= 5, clang >= 2.9 and icc >= 17. 25 - * In the meantime, to support 4.6 <= gcc < 5, we implement __has_attribute 25 + * In the meantime, to support gcc < 5, we implement __has_attribute 26 26 * by hand. 27 - * 28 - * sparse does not support __has_attribute (yet) and defines __GNUC_MINOR__ 29 - * depending on the compiler used to build it; however, these attributes have 30 - * no semantic effects for sparse, so it does not matter. Also note that, 31 - * in order to avoid sparse's warnings, even the unsupported ones must be 32 - * defined to 0. 33 27 */ 34 28 #ifndef __has_attribute 35 29 # define __has_attribute(x) __GCC4_has_attribute_##x

+2 -2

include/linux/compiler_types.h

··· 11 11 # define __iomem __attribute__((noderef, address_space(__iomem))) 12 12 # define __percpu __attribute__((noderef, address_space(__percpu))) 13 13 # define __rcu __attribute__((noderef, address_space(__rcu))) 14 - extern void __chk_user_ptr(const volatile void __user *); 15 - extern void __chk_io_ptr(const volatile void __iomem *); 14 + static inline void __chk_user_ptr(const volatile void __user *ptr) { } 15 + static inline void __chk_io_ptr(const volatile void __iomem *ptr) { } 16 16 /* context/locking */ 17 17 # define __must_hold(x) __attribute__((context(x,1,1))) 18 18 # define __acquires(x) __attribute__((context(x,0,1)))

Configure Feed

Configure Feed