Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Revert "namespace: add source file location exceptions"

This reverts commit 24a54f7974a616385b96cd939e004592e2cea484.

Stephen Hemminger <shemminger@vyatta.com> writes:
> That patch should not be included. It causes more problems than it
> solves, since then there are duplicate file locations which causes
> false duplicate symbol reports.

Reported-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>

-24
-24
scripts/namespace.pl
··· 141 141 'VDSO32_sigreturn' => 1, 142 142 ); 143 143 144 - # Files with exceptions to source file location 145 - my %sourceloc = ( 146 - 'net/dccp/dccp_probe.o' => 'probe', 147 - 'net/dccp/dccp_ipv4.o' => 'ipv4', 148 - 'net/dccp/dccp_ipv6.o' => 'ipv6', 149 - 'net/dccp/dccp_diag.o' => 'diag', 150 - 'drivers/char/hw_random/rng-core.o' => 'core', 151 - 'fs/fat/msdos.o' => 'namei_msdos', 152 - 'fs/fat/vfat.o' => 'namei_vfat', 153 - 'fs/nfs_common/nfs_acl.o' => 'nfsacl', 154 - 'sound/soundcore.o' => 'sound_core', 155 - 'drivers/md/dm-mirror.o' => 'dm-raid1', 156 - 'drivers/message/i2o/i2o_bus.o' => 'bus-osm', 157 - 'arch/x86/kvm/kvm-amd.o' => 'svm', 158 - 'arch/x86/kvm/kvm-intel.o' => 'vmx', 159 - 'arch/x86/crypto/twofish-x86_64.o' => 'twofish-x86_64-asm_64', 160 - 'arch/x86/crypto/aes-x86_64.o' => 'aes-x86_64-asm_64', 161 - 'arch/x86/crypto/aesni-intel.o' => 'aesni-intel_asm', 162 - 'arch/x86/crypto/salsa20-x86_64.o' => 'salsa20-x86_64-asm_64', 163 - ); 164 144 165 145 &find(\&linux_objects, '.'); # find the objects and do_nm on them 166 146 &list_multiply_defined(); ··· 228 248 return; 229 249 } 230 250 ($source = $basename) =~ s/\.o$//; 231 - 232 - $source = $sourceloc{$fullname} if ($sourceloc{$fullname}); 233 - 234 251 if (-e "$source.c" || -e "$source.S") { 235 252 $source = "$objtree$File::Find::dir/$source"; 236 253 } else { 237 254 $source = "$srctree$File::Find::dir/$source"; 238 255 } 239 - 240 256 if (! -e "$source.c" && ! -e "$source.S") { 241 257 # No obvious source, exclude the object if it is conglomerate 242 258 open(my $objdumpdata, "$objdump $basename|")