Revision e23e8c0690d2952dce53e712d01d5b2179f98b64 authored by Myron Stowe on 07 February 2012, 22:26:44 UTC, committed by Russell King on 21 February 2012, 09:35:32 UTC
The patch series to re-factor PCI's 'latency timer' setup (re: http://marc.info/?l=linux-kernel&m=131983853831049&w=2) forgot to remove the ARM specific definition of 'pcibios_max_latency' once such had been moved into the pci core resulting in ARM related compile errors - drivers/built-in.o:(.data+0x230): multiple definition of `pcibios_max_latency' arch/arm/common/built-in.o:(.data+0x40c): first defined here make[1]: *** [vmlinux.o] Error 1 In the series, patch 2/16 (commit 168c8619fd8) converted the ARM specific version of 'pcibios_set_master()' to a non-inlined version. This was done in preperation for hosting it up into PCI's core, which was done in patch 10/16 (commit 96c5590058d) of the series (and where the removal of ARM's 'pcibios_max_latency' was overlooked). Reported-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Myron Stowe <myron.stowe@redhat.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
1 parent 910ba59
| File | Mode | Size |
|---|---|---|
| partitions | ||
| Kconfig | -rw-r--r-- | 3.3 KB |
| Kconfig.iosched | -rw-r--r-- | 1.8 KB |
| Makefile | -rw-r--r-- | 720 bytes |
| blk-cgroup.c | -rw-r--r-- | 43.2 KB |
| blk-cgroup.h | -rw-r--r-- | 11.3 KB |
| blk-core.c | -rw-r--r-- | 76.7 KB |
| blk-exec.c | -rw-r--r-- | 3.0 KB |
| blk-flush.c | -rw-r--r-- | 13.1 KB |
| blk-integrity.c | -rw-r--r-- | 11.5 KB |
| blk-ioc.c | -rw-r--r-- | 10.6 KB |
| blk-iopoll.c | -rw-r--r-- | 5.9 KB |
| blk-lib.c | -rw-r--r-- | 3.9 KB |
| blk-map.c | -rw-r--r-- | 8.2 KB |
| blk-merge.c | -rw-r--r-- | 12.1 KB |
| blk-settings.c | -rw-r--r-- | 25.7 KB |
| blk-softirq.c | -rw-r--r-- | 4.6 KB |
| blk-sysfs.c | -rw-r--r-- | 14.8 KB |
| blk-tag.c | -rw-r--r-- | 9.8 KB |
| blk-throttle.c | -rw-r--r-- | 32.5 KB |
| blk-timeout.c | -rw-r--r-- | 5.6 KB |
| blk.h | -rw-r--r-- | 7.6 KB |
| bsg-lib.c | -rw-r--r-- | 7.6 KB |
| bsg.c | -rw-r--r-- | 23.7 KB |
| cfq-iosched.c | -rw-r--r-- | 99.4 KB |
| cfq.h | -rw-r--r-- | 3.7 KB |
| compat_ioctl.c | -rw-r--r-- | 20.8 KB |
| deadline-iosched.c | -rw-r--r-- | 11.1 KB |
| elevator.c | -rw-r--r-- | 23.5 KB |
| genhd.c | -rw-r--r-- | 42.8 KB |
| ioctl.c | -rw-r--r-- | 8.7 KB |
| noop-iosched.c | -rw-r--r-- | 2.4 KB |
| partition-generic.c | -rw-r--r-- | 13.3 KB |
| scsi_ioctl.c | -rw-r--r-- | 19.6 KB |
Computing file changes ...
