Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 537d1f70 authored by Matthias Maennich's avatar Matthias Maennich
Browse files

Revert "ANDROID: Revert "Merge tag 'modules-for-v5.4' of... 

Revert "ANDROID: Revert "Merge tag 'modules-for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux"

"

This reverts commit 3fde1dfb.

Revert to the upstream version by reinstating the original
modules-for-v5.4 merge.

Bug: 142892219
Bug: 144336692
Change-Id: I3871c67dd3cba0a5b9b2e1a87be8653a14cb9de5
Signed-off-by: default avatarMatthias Maennich <maennich@google.com>
parent bf868444

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
*.lzo

*.mod

*.mod.c

*.ns_deps

*.o

*.o.*

*.patch

Documentation/kbuild/modules.rst

+5 −2
Original line number Diff line number Diff line
@@ -470,9 +470,12 @@ build. 


	The syntax of the Module.symvers file is::



		<CRC>	    <Symbol>	       <module>

	<CRC>       <Symbol>          <Namespace>  <Module>                         <Export Type>



		0x2d036834  scsi_remove_host   drivers/scsi/scsi_mod

	0xe1cc2a05  usb_stor_suspend  USB_STORAGE  drivers/usb/storage/usb-storage  EXPORT_SYMBOL_GPL



	The fields are separated by tabs and values may be empty (e.g.

	if no namespace is defined for an exported symbol).



	For a kernel build without CONFIG_MODVERSIONS enabled, the CRC

	would read 0x00000000.

Documentation/kernel-hacking/hacking.rst

+18 −0
Original line number Diff line number Diff line
@@ -594,6 +594,24 @@ internal implementation issue, and not really an interface. Some 
maintainers and developers may however require EXPORT_SYMBOL_GPL()

when adding any new APIs or functionality.



:c:func:`EXPORT_SYMBOL_NS()`

----------------------------



Defined in ``include/linux/export.h``



This is the variant of `EXPORT_SYMBOL()` that allows specifying a symbol

namespace. Symbol Namespaces are documented in

``Documentation/kbuild/namespaces.rst``.



:c:func:`EXPORT_SYMBOL_NS_GPL()`

--------------------------------



Defined in ``include/linux/export.h``



This is the variant of `EXPORT_SYMBOL_GPL()` that allows specifying a symbol

namespace. Symbol Namespaces are documented in

``Documentation/kbuild/namespaces.rst``.



Routines and Conventions

========================

Makefile

+13 −1
Original line number Diff line number Diff line
@@ -1481,6 +1481,9 @@ help: 
	@echo  '  headerdep       - Detect inclusion cycles in headers'

	@echo  '  coccicheck      - Check with Coccinelle'

	@echo  ''

	@echo  'Tools:'

	@echo  '  nsdeps          - Generate missing symbol namespace dependencies'

	@echo  ''

	@echo  'Kernel selftest:'

	@echo  '  kselftest       - Build and run kernel selftest (run as root)'

	@echo  '                    Build, install, and boot kernel before'
@@ -1662,7 +1665,7 @@ clean: $(clean-dirs) 
		-o -name '*.ko.*' \

		-o -name '*.dtb' -o -name '*.dtb.S' -o -name '*.dt.yaml' \

		-o -name '*.dwo' -o -name '*.lst' \

		-o -name '*.su' -o -name '*.mod' \

		-o -name '*.su' -o -name '*.mod' -o -name '*.ns_deps' \

		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \

		-o -name '*.lex.c' -o -name '*.tab.[ch]' \

		-o -name '*.asn1.[ch]' \
@@ -1680,6 +1683,15 @@ quiet_cmd_tags = GEN $@ 
tags TAGS cscope gtags: FORCE

	$(call cmd,tags)



# Script to generate missing namespace dependencies

# ---------------------------------------------------------------------------



PHONY += nsdeps



nsdeps: modules

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost nsdeps

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/$@



# Scripts to check various things for consistency

# ---------------------------------------------------------------------------

arch/m68k/include/asm/export.h

+0 −1
Original line number Diff line number Diff line 
#define KSYM_ALIGN 2

#define KCRC_ALIGN 2

#include <asm-generic/export.h>