Commit 1ed0948e authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'noinstr-lds-2020-05-19' into core/rcu

Get the noinstr section and annotation markers to base the RCU parts on.
parents 68f0f269 65538966
Loading
Loading
Loading
Loading
+14 −4
Original line number Original line Diff line number Diff line
@@ -142,10 +142,13 @@ ForEachMacros:
  - 'for_each_card_auxs'
  - 'for_each_card_auxs'
  - 'for_each_card_auxs_safe'
  - 'for_each_card_auxs_safe'
  - 'for_each_card_components'
  - 'for_each_card_components'
  - 'for_each_card_dapms'
  - 'for_each_card_pre_auxs'
  - 'for_each_card_pre_auxs'
  - 'for_each_card_prelinks'
  - 'for_each_card_prelinks'
  - 'for_each_card_rtds'
  - 'for_each_card_rtds'
  - 'for_each_card_rtds_safe'
  - 'for_each_card_rtds_safe'
  - 'for_each_card_widgets'
  - 'for_each_card_widgets_safe'
  - 'for_each_cgroup_storage_type'
  - 'for_each_cgroup_storage_type'
  - 'for_each_child_of_node'
  - 'for_each_child_of_node'
  - 'for_each_clear_bit'
  - 'for_each_clear_bit'
@@ -160,6 +163,7 @@ ForEachMacros:
  - 'for_each_cpu_and'
  - 'for_each_cpu_and'
  - 'for_each_cpu_not'
  - 'for_each_cpu_not'
  - 'for_each_cpu_wrap'
  - 'for_each_cpu_wrap'
  - 'for_each_dapm_widgets'
  - 'for_each_dev_addr'
  - 'for_each_dev_addr'
  - 'for_each_dev_scope'
  - 'for_each_dev_scope'
  - 'for_each_displayid_db'
  - 'for_each_displayid_db'
@@ -170,7 +174,6 @@ ForEachMacros:
  - 'for_each_dpcm_fe'
  - 'for_each_dpcm_fe'
  - 'for_each_drhd_unit'
  - 'for_each_drhd_unit'
  - 'for_each_dss_dev'
  - 'for_each_dss_dev'
  - 'for_each_efi_handle'
  - 'for_each_efi_memory_desc'
  - 'for_each_efi_memory_desc'
  - 'for_each_efi_memory_desc_in_map'
  - 'for_each_efi_memory_desc_in_map'
  - 'for_each_element'
  - 'for_each_element'
@@ -191,6 +194,7 @@ ForEachMacros:
  - 'for_each_ip_tunnel_rcu'
  - 'for_each_ip_tunnel_rcu'
  - 'for_each_irq_nr'
  - 'for_each_irq_nr'
  - 'for_each_link_codecs'
  - 'for_each_link_codecs'
  - 'for_each_link_cpus'
  - 'for_each_link_platforms'
  - 'for_each_link_platforms'
  - 'for_each_lru'
  - 'for_each_lru'
  - 'for_each_matching_node'
  - 'for_each_matching_node'
@@ -250,6 +254,7 @@ ForEachMacros:
  - 'for_each_pci_bridge'
  - 'for_each_pci_bridge'
  - 'for_each_pci_dev'
  - 'for_each_pci_dev'
  - 'for_each_pci_msi_entry'
  - 'for_each_pci_msi_entry'
  - 'for_each_pcm_streams'
  - 'for_each_populated_zone'
  - 'for_each_populated_zone'
  - 'for_each_possible_cpu'
  - 'for_each_possible_cpu'
  - 'for_each_present_cpu'
  - 'for_each_present_cpu'
@@ -260,9 +265,12 @@ ForEachMacros:
  - 'for_each_property_of_node'
  - 'for_each_property_of_node'
  - 'for_each_registered_fb'
  - 'for_each_registered_fb'
  - 'for_each_reserved_mem_region'
  - 'for_each_reserved_mem_region'
  - 'for_each_rtd_codec_dai'
  - 'for_each_rtd_codec_dais'
  - 'for_each_rtd_codec_dai_rollback'
  - 'for_each_rtd_codec_dais_rollback'
  - 'for_each_rtd_components'
  - 'for_each_rtd_components'
  - 'for_each_rtd_cpu_dais'
  - 'for_each_rtd_cpu_dais_rollback'
  - 'for_each_rtd_dais'
  - 'for_each_set_bit'
  - 'for_each_set_bit'
  - 'for_each_set_bit_from'
  - 'for_each_set_bit_from'
  - 'for_each_set_clump8'
  - 'for_each_set_clump8'
@@ -334,6 +342,7 @@ ForEachMacros:
  - 'klp_for_each_object'
  - 'klp_for_each_object'
  - 'klp_for_each_object_safe'
  - 'klp_for_each_object_safe'
  - 'klp_for_each_object_static'
  - 'klp_for_each_object_static'
  - 'kunit_suite_for_each_test_case'
  - 'kvm_for_each_memslot'
  - 'kvm_for_each_memslot'
  - 'kvm_for_each_vcpu'
  - 'kvm_for_each_vcpu'
  - 'list_for_each'
  - 'list_for_each'
@@ -387,6 +396,7 @@ ForEachMacros:
  - 'of_property_for_each_string'
  - 'of_property_for_each_string'
  - 'of_property_for_each_u32'
  - 'of_property_for_each_u32'
  - 'pci_bus_for_each_resource'
  - 'pci_bus_for_each_resource'
  - 'pcm_for_each_format'
  - 'ping_portaddr_for_each_entry'
  - 'ping_portaddr_for_each_entry'
  - 'plist_for_each'
  - 'plist_for_each'
  - 'plist_for_each_continue'
  - 'plist_for_each_continue'
@@ -482,7 +492,7 @@ KeepEmptyLinesAtTheStartOfBlocks: false
MacroBlockBegin: ''
MacroBlockBegin: ''
MacroBlockEnd: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
MaxEmptyLinesToKeep: 1
NamespaceIndentation: Inner
NamespaceIndentation: None
#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0
#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0
ObjCBlockIndentWidth: 8
ObjCBlockIndentWidth: 8
ObjCSpaceAfterProperty: true
ObjCSpaceAfterProperty: true
+9 −6
Original line number Original line Diff line number Diff line
@@ -182,12 +182,15 @@ fix_padding
	space-efficient. If this option is not present, large padding is
	space-efficient. If this option is not present, large padding is
	used - that is for compatibility with older kernels.
	used - that is for compatibility with older kernels.



allow_discards
The journal mode (D/J), buffer_sectors, journal_watermark, commit_time can
	Allow block discard requests (a.k.a. TRIM) for the integrity device.
be changed when reloading the target (load an inactive table and swap the
	Discards are only allowed to devices using internal hash.
tables with suspend and resume). The other arguments should not be changed

when reloading the target because the layout of disk data depend on them
The journal mode (D/J), buffer_sectors, journal_watermark, commit_time and
and the reloaded target would be non-functional.
allow_discards can be changed when reloading the target (load an inactive
table and swap the tables with suspend and resume). The other arguments
should not be changed when reloading the target because the layout of disk
data depend on them and the reloaded target would be non-functional.




The layout of the formatted block device:
The layout of the formatted block device:
+1 −2
Original line number Original line Diff line number Diff line
@@ -5206,8 +5206,7 @@


	usbcore.old_scheme_first=
	usbcore.old_scheme_first=
			[USB] Start with the old device initialization
			[USB] Start with the old device initialization
			scheme,  applies only to low and full-speed devices
			scheme (default 0 = off).
			 (default 0 = off).


	usbcore.usbfs_memory_mb=
	usbcore.usbfs_memory_mb=
			[USB] Memory limit (in MB) for buffers allocated by
			[USB] Memory limit (in MB) for buffers allocated by
+26 −21
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ optional external memory-mapped interface.


Version 1 of the Activity Monitors architecture implements a counter group
Version 1 of the Activity Monitors architecture implements a counter group
of four fixed and architecturally defined 64-bit event counters.
of four fixed and architecturally defined 64-bit event counters.

- CPU cycle counter: increments at the frequency of the CPU.
- CPU cycle counter: increments at the frequency of the CPU.
- Constant counter: increments at the fixed frequency of the system
- Constant counter: increments at the fixed frequency of the system
  clock.
  clock.
@@ -57,6 +58,7 @@ counters, only the presence of the extension.


Firmware (code running at higher exception levels, e.g. arm-tf) support is
Firmware (code running at higher exception levels, e.g. arm-tf) support is
needed to:
needed to:

- Enable access for lower exception levels (EL2 and EL1) to the AMU
- Enable access for lower exception levels (EL2 and EL1) to the AMU
  registers.
  registers.
- Enable the counters. If not enabled these will read as 0.
- Enable the counters. If not enabled these will read as 0.
@@ -78,6 +80,7 @@ are not trapped in EL2/EL3.


The fixed counters of AMUv1 are accessible though the following system
The fixed counters of AMUv1 are accessible though the following system
register definitions:
register definitions:

- SYS_AMEVCNTR0_CORE_EL0
- SYS_AMEVCNTR0_CORE_EL0
- SYS_AMEVCNTR0_CONST_EL0
- SYS_AMEVCNTR0_CONST_EL0
- SYS_AMEVCNTR0_INST_RET_EL0
- SYS_AMEVCNTR0_INST_RET_EL0
@@ -93,6 +96,7 @@ Userspace access
----------------
----------------


Currently, access from userspace to the AMU registers is disabled due to:
Currently, access from userspace to the AMU registers is disabled due to:

- Security reasons: they might expose information about code executed in
- Security reasons: they might expose information about code executed in
  secure mode.
  secure mode.
- Purpose: AMU counters are intended for system management use.
- Purpose: AMU counters are intended for system management use.
@@ -105,6 +109,7 @@ Virtualization


Currently, access from userspace (EL0) and kernelspace (EL1) on the KVM
Currently, access from userspace (EL0) and kernelspace (EL1) on the KVM
guest side is disabled due to:
guest side is disabled due to:

- Security reasons: they might expose information about code executed
- Security reasons: they might expose information about code executed
  by other guests or the host.
  by other guests or the host.


+12 −9
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@
DT_DOC_CHECKER ?= dt-doc-validate
DT_DOC_CHECKER ?= dt-doc-validate
DT_EXTRACT_EX ?= dt-extract-example
DT_EXTRACT_EX ?= dt-extract-example
DT_MK_SCHEMA ?= dt-mk-schema
DT_MK_SCHEMA ?= dt-mk-schema
DT_MK_SCHEMA_USERONLY_FLAG := $(if $(DT_SCHEMA_FILES), -u)


quiet_cmd_chk_binding = CHKDT   $(patsubst $(srctree)/%,%,$<)
quiet_cmd_chk_binding = CHKDT   $(patsubst $(srctree)/%,%,$<)
      cmd_chk_binding = $(DT_DOC_CHECKER) -u $(srctree)/$(src) $< ; \
      cmd_chk_binding = $(DT_DOC_CHECKER) -u $(srctree)/$(src) $< ; \
@@ -13,16 +14,18 @@ $(obj)/%.example.dts: $(src)/%.yaml FORCE
# Use full schemas when checking %.example.dts
# Use full schemas when checking %.example.dts
DT_TMP_SCHEMA := $(obj)/processed-schema-examples.yaml
DT_TMP_SCHEMA := $(obj)/processed-schema-examples.yaml


find_cmd = find $(srctree)/$(src) \( -name '*.yaml' ! \
		-name 'processed-schema*' ! \
		-name '*.example.dt.yaml' \)

quiet_cmd_mk_schema = SCHEMA  $@
quiet_cmd_mk_schema = SCHEMA  $@
      cmd_mk_schema = $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) -o $@ $(real-prereqs)
      cmd_mk_schema = rm -f $@ ; \
                      $(if $(DT_MK_SCHEMA_FLAGS), \
                           echo $(real-prereqs), \
                           $(find_cmd)) | \
                      xargs $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) >> $@


DT_DOCS = $(addprefix $(src)/, \
DT_DOCS = $(shell $(find_cmd) | sed -e 's|^$(srctree)/||')
	$(shell \
	cd $(srctree)/$(src) && \
	find * \( -name '*.yaml' ! \
		-name 'processed-schema*' ! \
		-name '*.example.dt.yaml' \) \
	))


DT_SCHEMA_FILES ?= $(DT_DOCS)
DT_SCHEMA_FILES ?= $(DT_DOCS)


@@ -37,7 +40,7 @@ override DTC_FLAGS := \
$(obj)/processed-schema-examples.yaml: $(DT_DOCS) FORCE
$(obj)/processed-schema-examples.yaml: $(DT_DOCS) FORCE
	$(call if_changed,mk_schema)
	$(call if_changed,mk_schema)


$(obj)/processed-schema.yaml: DT_MK_SCHEMA_FLAGS := -u
$(obj)/processed-schema.yaml: DT_MK_SCHEMA_FLAGS := $(DT_MK_SCHEMA_USERONLY_FLAG)
$(obj)/processed-schema.yaml: $(DT_SCHEMA_FILES) FORCE
$(obj)/processed-schema.yaml: $(DT_SCHEMA_FILES) FORCE
	$(call if_changed,mk_schema)
	$(call if_changed,mk_schema)


Loading