Attachment #7929 for bug #35795

View | Details | Raw Unified | Return to bug 35795
Collapse All | Expand All

Lines 1302-1307 _modinst_: Link Here

(-)a/Makefile (+1 lines)
1302	fi	1302	fi
1303	@cp -f $(objtree)/modules.order $(MODLIB)/	1303	@cp -f $(objtree)/modules.order $(MODLIB)/
1304	@cp -f $(objtree)/modules.builtin $(MODLIB)/	1304	@cp -f $(objtree)/modules.builtin $(MODLIB)/
		1305	@cp -f $(objtree)/kernel.builtin.modinfo $(MODLIB)/
1305	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst	1306	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst
1306		1307
1307	# This depmod is only for convenience to give the initial	1308	# This depmod is only for convenience to give the initial




/* Chosen so that structs with an unsigned long line up. */
#define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long))

#ifdef MODULE
#define __MODULE_INFO(tag, name, info)					  \
static const char __UNIQUE_ID(name)[]					  \
  __used __attribute__((section(".modinfo"), unused, aligned(1)))	  \
  = MODULE_PARAM_PREFIX __stringify(tag) "=" info

/* This struct is here for syntactic coherency, it is not used */
#define __MODULE_INFO(tag, name, info)					  \
  struct __UNIQUE_ID(name) {}
#endif
#define __MODULE_PARM_TYPE(name, _type)					  \
  __MODULE_INFO(parmtype, name##type, #name ":" _type)


Lines 303-305 if [ -n "${CONFIG_KALLSYMS}" ]; then Link Here

(-)a/scripts/link-vmlinux.sh (+5 lines)
303	exit 1	303	exit 1
304	fi	304	fi
305	fi	305	fi
		306
		307	info MODINFO kernel.builtin.modinfo
		308	"${OBJCOPY}" -j .modinfo -O binary vmlinux kernel.builtin.modinfo
		309	chmod 444 kernel.builtin.modinfo
		310	"${OBJCOPY}" -R .modinfo vmlinux

Return to bug 35795

Lines 17-32 Link Here

(-)a/include/linux/moduleparam.h (-7 / +2 lines)
17	/* Chosen so that structs with an unsigned long line up. */	17	/* Chosen so that structs with an unsigned long line up. */
18	#define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long))	18	#define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long))
19		19
20	#ifdef MODULE
21	#define __MODULE_INFO(tag, name, info) \	20	#define __MODULE_INFO(tag, name, info) \
22	static const char __UNIQUE_ID(name)[] \	21	static const char __UNIQUE_ID(name)[] \
23	__used __attribute__((section(".modinfo"), unused, aligned(1))) \	22	__used __attribute__((section(".modinfo"), unused, aligned(1))) \
24	= __stringify(tag) "=" info	23	= MODULE_PARAM_PREFIX __stringify(tag) "=" info
25	#else /* !MODULE */	24
26	/* This struct is here for syntactic coherency, it is not used */
27	#define __MODULE_INFO(tag, name, info) \
28	struct __UNIQUE_ID(name) {}
29	#endif
30	#define __MODULE_PARM_TYPE(name, _type) \	25	#define __MODULE_PARM_TYPE(name, _type) \
31	__MODULE_INFO(parmtype, name##type, #name ":" _type)	26	__MODULE_INFO(parmtype, name##type, #name ":" _type)
32		27