Skip to content

Commit dd9fb9b

Browse files
committed
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
4 parents 70187f7 + 46d4a40 + 4e4bb89 + e5fc436 commit dd9fb9b

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

.clang-format

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ ForEachMacros:
111111
- 'css_for_each_descendant_pre'
112112
- 'device_for_each_child_node'
113113
- 'dma_fence_chain_for_each'
114+
- 'do_for_each_ftrace_op'
114115
- 'drm_atomic_crtc_for_each_plane'
115116
- 'drm_atomic_crtc_state_for_each_plane'
116117
- 'drm_atomic_crtc_state_for_each_plane_state'
@@ -136,6 +137,7 @@ ForEachMacros:
136137
- 'for_each_active_dev_scope'
137138
- 'for_each_active_drhd_unit'
138139
- 'for_each_active_iommu'
140+
- 'for_each_aggr_pgid'
139141
- 'for_each_available_child_of_node'
140142
- 'for_each_bio'
141143
- 'for_each_board_func_rsrc'
@@ -234,6 +236,7 @@ ForEachMacros:
234236
- 'for_each_node_state'
235237
- 'for_each_node_with_cpus'
236238
- 'for_each_node_with_property'
239+
- 'for_each_nonreserved_multicast_dest_pgid'
237240
- 'for_each_of_allnodes'
238241
- 'for_each_of_allnodes_from'
239242
- 'for_each_of_cpu_node'
@@ -256,6 +259,7 @@ ForEachMacros:
256259
- 'for_each_pci_dev'
257260
- 'for_each_pci_msi_entry'
258261
- 'for_each_pcm_streams'
262+
- 'for_each_physmem_range'
259263
- 'for_each_populated_zone'
260264
- 'for_each_possible_cpu'
261265
- 'for_each_present_cpu'
@@ -265,6 +269,8 @@ ForEachMacros:
265269
- 'for_each_process_thread'
266270
- 'for_each_property_of_node'
267271
- 'for_each_registered_fb'
272+
- 'for_each_requested_gpio'
273+
- 'for_each_requested_gpio_in_range'
268274
- 'for_each_reserved_mem_region'
269275
- 'for_each_rtd_codec_dais'
270276
- 'for_each_rtd_codec_dais_rollback'
@@ -278,12 +284,17 @@ ForEachMacros:
278284
- 'for_each_sg'
279285
- 'for_each_sg_dma_page'
280286
- 'for_each_sg_page'
287+
- 'for_each_sgtable_dma_page'
288+
- 'for_each_sgtable_dma_sg'
289+
- 'for_each_sgtable_page'
290+
- 'for_each_sgtable_sg'
281291
- 'for_each_sibling_event'
282292
- 'for_each_subelement'
283293
- 'for_each_subelement_extid'
284294
- 'for_each_subelement_id'
285295
- '__for_each_thread'
286296
- 'for_each_thread'
297+
- 'for_each_unicast_dest_pgid'
287298
- 'for_each_wakeup_source'
288299
- 'for_each_zone'
289300
- 'for_each_zone_zonelist'
@@ -464,6 +475,7 @@ ForEachMacros:
464475
- 'v4l2_m2m_for_each_src_buf'
465476
- 'v4l2_m2m_for_each_src_buf_safe'
466477
- 'virtio_device_for_each_vq'
478+
- 'while_for_each_ftrace_op'
467479
- 'xa_for_each'
468480
- 'xa_for_each_marked'
469481
- 'xa_for_each_range'

drivers/auxdisplay/arm-charlcd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/*
33
* Driver for the on-board character LCD found on some ARM reference boards
44
* 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
66
* Currently it will just display the text "ARM Linux" and the linux version
77
*
88
* Author: Linus Walleij <[email protected]>

include/linux/compiler_attributes.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,8 @@
2222

2323
/*
2424
* __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
2626
* 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.
3327
*/
3428
#ifndef __has_attribute
3529
# define __has_attribute(x) __GCC4_has_attribute_##x

include/linux/compiler_types.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# define __iomem __attribute__((noderef, address_space(__iomem)))
1212
# define __percpu __attribute__((noderef, address_space(__percpu)))
1313
# 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) { }
1616
/* context/locking */
1717
# define __must_hold(x) __attribute__((context(x,1,1)))
1818
# define __acquires(x) __attribute__((context(x,0,1)))

0 commit comments

Comments
 (0)