ANDROID: debug_kinfo: fix build issues due to module memory logic change

In commit ac3b432839 ("module: replace module_layout with
module_memory"), the way module memory layouts are allocated and
accessed has radically changed, which broke the build of the Android
debug_kinfo structure as it had two module memory fields in it.

Remove those fields from the debug_kinfo structure as they are no longer
relevant at all.

Fixes: ac3b432839 ("module: replace module_layout with module_memory")
Change-Id: I6c5f8c0fa349573b64c2d8118046f5fee13b1dc8
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

drivers/android/debug_kinfo.c

@@ -160,8 +160,6 @@ static int debug_kinfo_probe(struct platform_device *pdev)
 	info->swapper_pg_dir_pa = (u64)__pa_symbol(swapper_pg_dir);
 	strlcpy(info->last_uts_release, init_utsname()->release, sizeof(info->last_uts_release));
 	info->enabled_modules_tree_lookup = IS_ENABLED(CONFIG_MODULES_TREE_LOOKUP);
-	info->mod_core_layout_offset = offsetof(struct module, core_layout);
-	info->mod_init_layout_offset = offsetof(struct module, init_layout);
 	info->mod_kallsyms_offset = offsetof(struct module, kallsyms);
 #if defined(CONFIG_RANDOMIZE_BASE) && defined(MODULES_VSIZE)
 	info->module_start_va = module_alloc_base;

drivers/android/debug_kinfo.h

@@ -55,8 +55,6 @@ struct kernel_info {
 
 	/* For module kallsyms */
 	__u32 enabled_modules_tree_lookup;
-	__u32 mod_core_layout_offset;
-	__u32 mod_init_layout_offset;
 	__u32 mod_kallsyms_offset;
 	__u64 module_start_va;
 	__u64 module_end_va;