From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Jun 2010 15:55:52 +0000 (-0700)
Subject: Merge branch 'for-35' of git://repo.or.cz/linux-kbuild
X-Git-Tag: v2.6.35-rc2~61
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=1f73897861b8ef0be64ff4b801f8d6f830f683b5

Merge branch 'for-35' of git://repo.or.cz/linux-kbuild

* 'for-35' of git://repo.or.cz/linux-kbuild: (81 commits)
  kbuild: Revert part of e8d400a to resolve a conflict
  kbuild: Fix checking of scm-identifier variable
  gconfig: add support to show hidden options that have prompts
  menuconfig: add support to show hidden options which have prompts
  gconfig: remove show_debug option
  gconfig: remove dbg_print_ptype() and dbg_print_stype()
  kconfig: fix zconfdump()
  kconfig: some small fixes
  add random binaries to .gitignore
  kbuild: Include gen_initramfs_list.sh and the file list in the .d file
  kconfig: recalc symbol value before showing search results
  .gitignore: ignore *.lzo files
  headerdep: perlcritic warning
  scripts/Makefile.lib: Align the output of LZO
  kbuild: Generate modules.builtin in make modules_install
  Revert "kbuild: specify absolute paths for cscope"
  kbuild: Do not unnecessarily regenerate modules.builtin
  headers_install: use local file handles
  headers_check: fix perl warnings
  export_report: fix perl warnings
  ...
---

1f73897861b8ef0be64ff4b801f8d6f830f683b5
diff --cc kernel/module.c
index d806e00,5daf0ab..0129769
--- a/kernel/module.c
+++ b/kernel/module.c
@@@ -403,11 -397,10 +403,11 @@@ static unsigned int find_pcpusec(Elf_Eh
  				 Elf_Shdr *sechdrs,
  				 const char *secstrings)
  {
- 	return find_sec(hdr, sechdrs, secstrings, ".data.percpu");
+ 	return find_sec(hdr, sechdrs, secstrings, ".data..percpu");
  }
  
 -static void percpu_modcopy(void *pcpudest, const void *from, unsigned long size)
 +static void percpu_modcopy(struct module *mod,
 +			   const void *from, unsigned long size)
  {
  	int cpu;