Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

cff2f741 · Linus Torvalds <[email protected]> · 2012-12-11 13:13:55 -08:00

Pull driver core updates from Greg Kroah-Hartman:
 "Here's the large driver core updates for 3.8-rc1.

  The biggest thing here is the various __dev* marking removals.  This
  is going to be a pain for the merge with different subsystem trees, I
  know, but all of the patches included here have been ACKed by their
  various subsystem maintainers, as they wanted them to go through here.

  If this is too much of a pain, I can pull all of them out of this tree
  and just send you one with the other fixes/updates and then, after
  3.8-rc1 is out, do the rest of the removals to ensure we catch them
  all, it's up to you.  The merges should all be trivial, and Stephen
  has been doing them all in linux-next for a few weeks now quite
  easily.

  Other than the __dev* marking removals, there's nothing major here,
  some firmware loading updates and other minor things in the driver
  core.

  All of these have (much to Stephen's annoyance), been in linux-next
  for a while.

  Signed-off-by: Greg Kroah-Hartman <[email protected]>"

Fixed up trivial conflicts in drivers/gpio/gpio-{em,stmpe}.c due to gpio
update.

* tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (93 commits)
  modpost.c: Stop checking __dev* section mismatches
  init.h: Remove __dev* sections from the kernel
  acpi: remove use of __devinit
  PCI: Remove __dev* markings
  PCI: Always build setup-bus when PCI is enabled
  PCI: Move pci_uevent into pci-driver.c
  PCI: Remove CONFIG_HOTPLUG ifdefs
  unicore32/PCI: Remove CONFIG_HOTPLUG ifdefs
  sh/PCI: Remove CONFIG_HOTPLUG ifdefs
  powerpc/PCI: Remove CONFIG_HOTPLUG ifdefs
  mips/PCI: Remove CONFIG_HOTPLUG ifdefs
  microblaze/PCI: Remove CONFIG_HOTPLUG ifdefs
  dma: remove use of __devinit
  dma: remove use of __devexit_p
  firewire: remove use of __devinitdata
  firewire: remove use of __devinit
  leds: remove use of __devexit
  leds: remove use of __devinit
  leds: remove use of __devexit_p
  mmc: remove use of __devexit
  ...

Commit: cff2f741b8ee8a70b208830e330de053efd4fc45
Parents: b0885d01 · 92e9e6d1

Merge commit. Changes below are compared with the first parent: b0885d01.

Changes

492 files changed · +2042 −1840

File	Status	Add	Del	Content
Documentation/firmware_class/README	modified	+12	−0	View file
Documentation/zh_CN/arm/kernel_user_helpers.txt	added	+284	−0	View file
Documentation/zh_CN/arm64/memory.txt	modified	+7	−7	View file
arch/microblaze/pci/pci-common.c	modified	+0	−4	View file
arch/mips/pci/pci.c	modified	+0	−2	View file
arch/powerpc/kernel/pci-common.c	modified	+0	−4	View file
arch/powerpc/kernel/pci_64.c	modified	+0	−4	View file
arch/sh/drivers/pci/pci.c	modified	+0	−2	View file
arch/unicore32/kernel/pci.c	modified	+0	−2	View file
drivers/acpi/apei/ghes.c	modified	+1	−1	View file
drivers/acpi/hed.c	modified	+1	−1	View file
drivers/acpi/pci_root.c	modified	+1	−1	View file
drivers/base/Kconfig	modified	+3	−4	View file
drivers/base/attribute_container.c	modified	+1	−1	View file
drivers/base/bus.c	modified	+0	−14	View file
drivers/base/core.c	modified	+5	−3	View file
drivers/base/devres.c	modified	+2	−2	View file
drivers/base/firmware_class.c	modified	+40	−12	View file
drivers/base/platform.c	modified	+2	−2	View file
drivers/char/tpm/tpm_i2c_infineon.c	modified	+2	−2	View file
drivers/char/tpm/tpm_ibmvtpm.c	modified	+1	−1	View file
drivers/char/tpm/tpm_infineon.c	modified	+2	−2	View file
drivers/char/tpm/tpm_tis.c	modified	+1	−1	View file
drivers/clk/clk-max77686.c	modified	+3	−3	View file
drivers/clk/clk-wm831x.c	modified	+3	−3	View file
drivers/dma/dw_dmac.c	modified	+2	−2	View file
drivers/dma/edma.c	modified	+2	−2	View file
drivers/dma/fsldma.c	modified	+2	−2	View file
drivers/dma/intel_mid_dma.c	modified	+2	−2	View file
drivers/dma/ioat/pci.c	modified	+1	−1	View file
drivers/dma/iop-adma.c	modified	+5	−5	View file
drivers/dma/mmp_pdma.c	modified	+3	−3	View file
drivers/dma/mmp_tdma.c	modified	+3	−3	View file
drivers/dma/mpc512x_dma.c	modified	+2	−2	View file
drivers/dma/mv_xor.c	modified	+4	−4	View file
drivers/dma/pch_dma.c	modified	+2	−2	View file
drivers/dma/pl330.c	modified	+1	−1	View file
drivers/dma/ppc4xx/adma.c	modified	+2	−2	View file
drivers/dma/sa11x0-dma.c	modified	+3	−3	View file
drivers/dma/sh/shdma.c	modified	+3	−3	View file
drivers/dma/sirf-dma.c	modified	+2	−2	View file
drivers/dma/tegra20-apb-dma.c	modified	+2	−2	View file
drivers/dma/timb_dma.c	modified	+1	−1	View file
drivers/firewire/nosy.c	modified	+2	−2	View file
drivers/firewire/ohci.c	modified	+1	−1	View file
drivers/gpio/gpio-74x164.c	modified	+3	−3	View file
drivers/gpio/gpio-ab8500.c	modified	+3	−3	View file
drivers/gpio/gpio-adnp.c	modified	+5	−5	View file
drivers/gpio/gpio-adp5520.c	modified	+3	−3	View file
drivers/gpio/gpio-adp5588.c	modified	+3	−3	View file
drivers/gpio/gpio-arizona.c	modified	+3	−3	View file
drivers/gpio/gpio-cs5535.c	modified	+3	−3	View file
drivers/gpio/gpio-da9052.c	modified	+4	−4	View file
drivers/gpio/gpio-em.c	modified	+3	−3	View file
drivers/gpio/gpio-ep93xx.c	modified	+1	−1	View file
drivers/gpio/gpio-generic.c	modified	+3	−3	View file
drivers/gpio/gpio-ich.c	modified	+5	−5	View file
drivers/gpio/gpio-janz-ttl.c	modified	+5	−5	View file
drivers/gpio/gpio-langwell.c	modified	+4	−4	View file
drivers/gpio/gpio-lpc32xx.c	modified	+2	−2	View file
drivers/gpio/gpio-max7300.c	modified	+3	−3	View file
drivers/gpio/gpio-max7301.c	modified	+3	−3	View file
drivers/gpio/gpio-max730x.c	modified	+2	−2	View file
drivers/gpio/gpio-max732x.c	modified	+4	−4	View file
drivers/gpio/gpio-mc33880.c	modified	+3	−3	View file
drivers/gpio/gpio-mcp23s08.c	modified	+3	−3	View file
drivers/gpio/gpio-ml-ioh.c	modified	+4	−4	View file
drivers/gpio/gpio-mpc5200.c	modified	+2	−2	View file
drivers/gpio/gpio-msic.c	modified	+1	−1	View file
drivers/gpio/gpio-msm-v2.c	modified	+3	−3	View file
drivers/gpio/gpio-mvebu.c	modified	+2	−2	View file
drivers/gpio/gpio-mxc.c	modified	+2	−2	View file
drivers/gpio/gpio-mxs.c	modified	+1	−1	View file
drivers/gpio/gpio-omap.c	modified	+3	−3	View file
drivers/gpio/gpio-pca953x.c	modified	+3	−3	View file
drivers/gpio/gpio-pch.c	modified	+4	−4	View file
drivers/gpio/gpio-pxa.c	modified	+3	−3	View file
drivers/gpio/gpio-rc5t583.c	modified	+3	−3	View file
drivers/gpio/gpio-rdc321x.c	modified	+3	−3	View file
drivers/gpio/gpio-sch.c	modified	+3	−3	View file
drivers/gpio/gpio-sodaville.c	modified	+2	−2	View file
drivers/gpio/gpio-sta2x11.c	modified	+2	−2	View file
drivers/gpio/gpio-stmpe.c	modified	+4	−4	View file
drivers/gpio/gpio-stp-xway.c	modified	+1	−1	View file
drivers/gpio/gpio-sx150x.c	modified	+3	−3	View file
drivers/gpio/gpio-tc3589x.c	modified	+3	−3	View file
drivers/gpio/gpio-tegra.c	modified	+2	−2	View file
drivers/gpio/gpio-timberdale.c	modified	+2	−2	View file
drivers/gpio/gpio-tps6586x.c	modified	+3	−3	View file
drivers/gpio/gpio-tps65910.c	modified	+3	−3	View file
drivers/gpio/gpio-tps65912.c	modified	+3	−3	View file
drivers/gpio/gpio-twl4030.c	modified	+4	−4	View file
drivers/gpio/gpio-twl6040.c	modified	+2	−2	View file
drivers/gpio/gpio-vr41xx.c	modified	+3	−3	View file
drivers/gpio/gpio-vt8500.c	modified	+1	−1	View file
drivers/gpio/gpio-vx855.c	modified	+3	−3	View file
drivers/gpio/gpio-wm831x.c	modified	+3	−3	View file
drivers/gpio/gpio-wm8350.c	modified	+3	−3	View file
drivers/gpio/gpio-wm8994.c	modified	+3	−3	View file
drivers/gpio/gpio-xilinx.c	modified	+2	−2	View file
drivers/hwmon/abituguru.c	modified	+6	−6	View file
drivers/hwmon/abituguru3.c	modified	+3	−3	View file
drivers/hwmon/ad7314.c	modified	+3	−3	View file
drivers/hwmon/ad7414.c	modified	+2	−2	View file
drivers/hwmon/adcxx.c	modified	+3	−3	View file
drivers/hwmon/ads7871.c	modified	+3	−3	View file
drivers/hwmon/adt7411.c	modified	+3	−3	View file
drivers/hwmon/coretemp.c	modified	+4	−4	View file
drivers/hwmon/da9052-hwmon.c	modified	+3	−3	View file
drivers/hwmon/dme1737.c	modified	+3	−3	View file
drivers/hwmon/f71805f.c	modified	+4	−4	View file
drivers/hwmon/f71882fg.c	modified	+4	−4	View file
drivers/hwmon/fam15h_power.c	modified	+5	−5	View file
drivers/hwmon/gpio-fan.c	modified	+4	−4	View file
drivers/hwmon/hih6130.c	modified	+3	−3	View file
drivers/hwmon/i5k_amb.c	modified	+9	−9	View file
drivers/hwmon/it87.c	modified	+6	−6	View file
drivers/hwmon/jz4740-hwmon.c	modified	+3	−3	View file
drivers/hwmon/k10temp.c	modified	+4	−4	View file
drivers/hwmon/k8temp.c	modified	+4	−4	View file
drivers/hwmon/lm70.c	modified	+3	−3	View file
drivers/hwmon/lm78.c	modified	+3	−3	View file
drivers/hwmon/max1111.c	modified	+4	−4	View file
drivers/hwmon/max197.c	modified	+3	−3	View file
drivers/hwmon/mc13783-adc.c	modified	+2	−2	View file
drivers/hwmon/ntc_thermistor.c	modified	+3	−3	View file
drivers/hwmon/pc87360.c	modified	+4	−4	View file
drivers/hwmon/pc87427.c	modified	+5	−5	View file
drivers/hwmon/s3c-hwmon.c	modified	+3	−3	View file
drivers/hwmon/sch5627.c	modified	+2	−2	View file
drivers/hwmon/sch5636.c	modified	+1	−1	View file
drivers/hwmon/sht15.c	modified	+3	−3	View file
drivers/hwmon/sht21.c	modified	+3	−3	View file
drivers/hwmon/sis5595.c	modified	+8	−8	View file
drivers/hwmon/smsc47b397.c	modified	+3	−3	View file
drivers/hwmon/tmp102.c	modified	+3	−3	View file
drivers/hwmon/twl4030-madc-hwmon.c	modified	+2	−2	View file
drivers/hwmon/ultra45_env.c	modified	+3	−3	View file
drivers/hwmon/via-cputemp.c	modified	+3	−3	View file
drivers/hwmon/via686a.c	modified	+7	−7	View file
drivers/hwmon/vt1211.c	modified	+4	−4	View file
drivers/hwmon/vt8231.c	modified	+6	−6	View file
drivers/hwmon/w83627ehf.c	modified	+6	−6	View file
drivers/hwmon/w83627hf.c	modified	+7	−7	View file
drivers/hwmon/w83781d.c	modified	+3	−3	View file
drivers/hwmon/wm831x-hwmon.c	modified	+3	−3	View file
drivers/hwmon/wm8350-hwmon.c	modified	+3	−3	View file
drivers/hwspinlock/omap_hwspinlock.c	modified	+3	−3	View file
drivers/hwspinlock/u8500_hsem.c	modified	+3	−3	View file
drivers/leds/leds-adp5520.c	modified	+4	−4	View file
drivers/leds/leds-asic3.c	modified	+3	−3	View file
drivers/leds/leds-atmel-pwm.c	modified	+1	−1	View file
drivers/leds/leds-bd2802.c	modified	+1	−1	View file
drivers/leds/leds-blinkm.c	modified	+3	−3	View file
drivers/leds/leds-clevo-mail.c	modified	+1	−1	View file
drivers/leds/leds-cobalt-qube.c	modified	+3	−3	View file
drivers/leds/leds-cobalt-raq.c	modified	+3	−3	View file
drivers/leds/leds-da903x.c	modified	+3	−3	View file
drivers/leds/leds-da9052.c	modified	+3	−3	View file
drivers/leds/leds-gpio.c	modified	+6	−6	View file
drivers/leds/leds-lm3530.c	modified	+3	−3	View file
drivers/leds/leds-lm3533.c	modified	+4	−4	View file
drivers/leds/leds-lm355x.c	modified	+4	−4	View file
drivers/leds/leds-lm3642.c	modified	+4	−4	View file
drivers/leds/leds-lp3944.c	modified	+3	−3	View file
drivers/leds/leds-lp5521.c	modified	+4	−4	View file
drivers/leds/leds-lp5523.c	modified	+2	−2	View file
drivers/leds/leds-lp8788.c	modified	+3	−3	View file
drivers/leds/leds-lt3593.c	modified	+4	−4	View file
drivers/leds/leds-max8997.c	modified	+3	−3	View file
drivers/leds/leds-mc13783.c	modified	+5	−5	View file
drivers/leds/leds-netxbig.c	modified	+5	−5	View file
drivers/leds/leds-ns2.c	modified	+4	−4	View file
drivers/leds/leds-ot200.c	modified	+3	−3	View file
drivers/leds/leds-pca955x.c	modified	+3	−3	View file
drivers/leds/leds-pca9633.c	modified	+3	−3	View file
drivers/leds/leds-pwm.c	modified	+2	−2	View file
drivers/leds/leds-rb532.c	modified	+3	−3	View file
drivers/leds/leds-regulator.c	modified	+3	−3	View file
drivers/leds/leds-renesas-tpu.c	modified	+3	−3	View file
drivers/leds/leds-ss4200.c	modified	+2	−2	View file
drivers/leds/leds-sunfire.c	modified	+6	−6	View file
drivers/leds/leds-tca6507.c	modified	+3	−3	View file
drivers/mfd/88pm800.c	modified	+6	−6	View file
drivers/mfd/88pm805.c	modified	+5	−5	View file
drivers/mfd/88pm80x.c	modified	+1	−1	View file
drivers/mfd/88pm860x-core.c	modified	+52	−52	View file
drivers/mfd/ab3100-core.c	modified	+6	−7	View file
drivers/mfd/ab8500-core.c	modified	+20	−20	View file
drivers/mfd/ab8500-debugfs.c	modified	+3	−3	View file
drivers/mfd/ab8500-gpadc.c	modified	+3	−3	View file
drivers/mfd/ab8500-sysctrl.c	modified	+3	−3	View file
drivers/mfd/adp5520.c	modified	+3	−3	View file
drivers/mfd/arizona-core.c	modified	+2	−2	View file
drivers/mfd/arizona-i2c.c	modified	+3	−3	View file
drivers/mfd/arizona-spi.c	modified	+3	−3	View file
drivers/mfd/asic3.c	modified	+2	−2	View file
drivers/mfd/cs5535-mfd.c	modified	+6	−6	View file
drivers/mfd/da903x.c	modified	+5	−5	View file
drivers/mfd/da9052-core.c	modified	+2	−2	View file
drivers/mfd/da9052-i2c.c	modified	+3	−3	View file
drivers/mfd/da9052-spi.c	modified	+3	−3	View file
drivers/mfd/da9055-core.c	modified	+2	−2	View file
drivers/mfd/da9055-i2c.c	modified	+3	−3	View file
drivers/mfd/davinci_voicecodec.c	modified	+2	−2	View file
drivers/mfd/db8500-prcmu.c	modified	+1	−1	View file
drivers/mfd/ezx-pcap.c	modified	+4	−4	View file
drivers/mfd/htc-i2cpld.c	modified	+6	−6	View file
drivers/mfd/intel_msic.c	modified	+5	−5	View file
drivers/mfd/janz-cmodio.c	modified	+5	−5	View file
drivers/mfd/jz4740-adc.c	modified	+3	−3	View file
drivers/mfd/lm3533-core.c	modified	+9	−9	View file
drivers/mfd/lp8788.c	modified	+2	−2	View file
drivers/mfd/lpc_ich.c	modified	+10	−10	View file
drivers/mfd/lpc_sch.c	modified	+3	−3	View file
drivers/mfd/max77686.c	modified	+1	−1	View file
drivers/mfd/max8907.c	modified	+2	−2	View file
drivers/mfd/max8925-core.c	modified	+29	−29	View file
drivers/mfd/max8925-i2c.c	modified	+3	−3	View file
drivers/mfd/mc13xxx-i2c.c	modified	+2	−2	View file
drivers/mfd/mc13xxx-spi.c	modified	+2	−2	View file
drivers/mfd/omap-usb-host.c	modified	+2	−2	View file
drivers/mfd/omap-usb-tll.c	modified	+3	−3	View file
drivers/mfd/palmas.c	modified	+3	−3	View file
drivers/mfd/pcf50633-adc.c	modified	+3	−3	View file
drivers/mfd/pcf50633-core.c	modified	+3	−3	View file
drivers/mfd/pm8921-core.c	modified	+4	−4	View file
drivers/mfd/pm8xxx-irq.c	modified	+2	−2	View file
drivers/mfd/rc5t583.c	modified	+3	−3	View file
drivers/mfd/rdc321x-southbridge.c	modified	+3	−3	View file
drivers/mfd/sm501.c	modified	+8	−8	View file
drivers/mfd/sta2x11-mfd.c	modified	+10	−10	View file
drivers/mfd/stmpe-i2c.c	modified	+3	−3	View file
drivers/mfd/stmpe-spi.c	modified	+3	−3	View file
drivers/mfd/syscon.c	modified	+3	−3	View file
drivers/mfd/tc3589x.c	modified	+4	−4	View file
drivers/mfd/tc6387xb.c	modified	+3	−3	View file
drivers/mfd/tc6393xb.c	modified	+6	−6	View file
drivers/mfd/ti-ssp.c	modified	+3	−3	View file
drivers/mfd/timberdale.c	modified	+32	−32	View file
drivers/mfd/tps6105x.c	modified	+4	−4	View file
drivers/mfd/tps65090.c	modified	+4	−4	View file
drivers/mfd/tps65217.c	modified	+3	−3	View file
drivers/mfd/tps6586x.c	modified	+5	−5	View file
drivers/mfd/tps65910.c	modified	+5	−5	View file
drivers/mfd/tps65911-comparator.c	modified	+3	−3	View file
drivers/mfd/tps65912-spi.c	modified	+3	−3	View file
drivers/mfd/twl-core.c	modified	+1	−1	View file
drivers/mfd/twl4030-audio.c	modified	+3	−3	View file
drivers/mfd/twl4030-madc.c	modified	+2	−2	View file
drivers/mfd/twl4030-power.c	modified	+10	−10	View file
drivers/mfd/vx855.c	modified	+3	−3	View file
drivers/mfd/wl1273-core.c	modified	+2	−2	View file
drivers/mfd/wm831x-spi.c	modified	+3	−3	View file
drivers/mfd/wm8994-core.c	modified	+8	−8	View file
drivers/mmc/host/atmel-mci.c	modified	+1	−1	View file
drivers/mmc/host/au1xmmc.c	modified	+2	−2	View file
drivers/mmc/host/bfin_sdh.c	modified	+3	−3	View file
drivers/mmc/host/cb710-mmc.c	modified	+3	−3	View file
drivers/mmc/host/dw_mmc-pci.c	modified	+2	−2	View file
drivers/mmc/host/dw_mmc-pltfm.c	modified	+2	−2	View file
drivers/mmc/host/dw_mmc-pltfm.h	modified	+1	−1	View file
drivers/mmc/host/jz4740_mmc.c	modified	+6	−6	View file
drivers/mmc/host/mmc_spi.c	modified	+3	−3	View file
drivers/mmc/host/mmci.c	modified	+5	−5	View file
drivers/mmc/host/omap.c	modified	+4	−4	View file
drivers/mmc/host/omap_hsmmc.c	modified	+3	−3	View file
drivers/mmc/host/pxamci.c	modified	+2	−2	View file
drivers/mmc/host/s3cmci.c	modified	+3	−3	View file
drivers/mmc/host/sdhci-cns3xxx.c	modified	+3	−3	View file
drivers/mmc/host/sdhci-dove.c	modified	+4	−4	View file
drivers/mmc/host/sdhci-esdhc-imx.c	modified	+4	−4	View file
drivers/mmc/host/sdhci-of-esdhc.c	modified	+3	−3	View file
drivers/mmc/host/sdhci-of-hlwd.c	modified	+3	−3	View file
drivers/mmc/host/sdhci-pci.c	modified	+7	−7	View file
drivers/mmc/host/sdhci-pxav2.c	modified	+3	−3	View file
drivers/mmc/host/sdhci-pxav3.c	modified	+3	−3	View file
drivers/mmc/host/sdhci-s3c.c	modified	+5	−5	View file
drivers/mmc/host/sdhci-spear.c	modified	+5	−7	View file
drivers/mmc/host/sdhci-tegra.c	modified	+5	−5	View file
drivers/mmc/host/sh_mmcif.c	modified	+2	−2	View file
drivers/mmc/host/sh_mobile_sdhi.c	modified	+2	−2	View file
drivers/mmc/host/tmio_mmc.c	modified	+3	−3	View file
drivers/mmc/host/tmio_mmc_pio.c	modified	+1	−1	View file
drivers/mmc/host/via-sdmmc.c	modified	+3	−3	View file
drivers/mmc/host/wbsd.c	modified	+14	−14	View file
drivers/pci/Makefile	modified	+1	−6	View file
drivers/pci/hotplug.c	deleted	+0	−37	View before deletion
drivers/pci/hotplug/cpcihp_zt5550.c	modified	+2	−2	View file
drivers/pci/ioapic.c	modified	+3	−3	View file
drivers/pci/pci-driver.c	modified	+30	−12	View file
drivers/pci/pci-sysfs.c	modified	+0	−7	View file
drivers/pci/pci.c	modified	+2	−2	View file
drivers/pci/pci.h	modified	+0	−5	View file
drivers/pci/pcie/aer/aerdrv.c	modified	+2	−2	View file
drivers/pci/pcie/portdrv_pci.c	modified	+1	−1	View file
drivers/pci/probe.c	modified	+9	−11	View file
drivers/pci/quirks.c	modified	+66	−66	View file
drivers/pci/xen-pcifront.c	modified	+5	−5	View file
drivers/pcmcia/bcm63xx_pcmcia.c	modified	+6	−6	View file
drivers/pcmcia/bfin_cf_pcmcia.c	modified	+3	−3	View file
drivers/pcmcia/db1xxx_ss.c	modified	+3	−3	View file
drivers/pcmcia/ds.c	modified	+1	−12	View file
drivers/pcmcia/electra_cf.c	modified	+2	−2	View file
drivers/pcmcia/i82092.c	modified	+3	−3	View file
drivers/pcmcia/pd6729.c	modified	+4	−4	View file
drivers/pcmcia/pxa2xx_sharpsl.c	modified	+1	−1	View file
drivers/pcmcia/rsrc_nonstatic.c	modified	+3	−3	View file
drivers/pcmcia/sa1100_assabet.c	modified	+1	−1	View file
drivers/pcmcia/sa1100_cerf.c	modified	+1	−1	View file
drivers/pcmcia/sa1100_generic.c	modified	+2	−2	View file
drivers/pcmcia/sa1100_h3600.c	modified	+1	−1	View file
drivers/pcmcia/sa1100_shannon.c	modified	+1	−1	View file
drivers/pcmcia/sa1100_simpad.c	modified	+1	−1	View file
drivers/pcmcia/sa1111_generic.c	modified	+2	−2	View file
drivers/pcmcia/sa1111_jornada720.c	modified	+1	−1	View file
drivers/pcmcia/vrc4171_card.c	modified	+4	−4	View file
drivers/pcmcia/vrc4173_cardu.c	modified	+4	−4	View file
drivers/pcmcia/xxs1500_ss.c	modified	+3	−3	View file
drivers/pcmcia/yenta_socket.c	modified	+3	−3	View file
drivers/pinctrl/pinctrl-bcm2835.c	modified	+4	−4	View file
drivers/pinctrl/pinctrl-imx.c	modified	+1	−1	View file
drivers/pinctrl/pinctrl-imx23.c	modified	+2	−2	View file
drivers/pinctrl/pinctrl-imx28.c	modified	+2	−2	View file
drivers/pinctrl/pinctrl-imx35.c	modified	+2	−2	View file
drivers/pinctrl/pinctrl-imx51.c	modified	+2	−2	View file
drivers/pinctrl/pinctrl-imx53.c	modified	+2	−2	View file
drivers/pinctrl/pinctrl-imx6q.c	modified	+2	−2	View file
drivers/pinctrl/pinctrl-mmp2.c	modified	+2	−2	View file
drivers/pinctrl/pinctrl-mxs.c	modified	+1	−1	View file
drivers/pinctrl/pinctrl-pxa168.c	modified	+2	−2	View file
drivers/pinctrl/pinctrl-pxa910.c	modified	+2	−2	View file
drivers/pinctrl/pinctrl-single.c	modified	+3	−3	View file
drivers/pinctrl/pinctrl-sirf.c	modified	+1	−1	View file
drivers/pinctrl/pinctrl-tegra.c	modified	+1	−1	View file
drivers/pinctrl/pinctrl-tegra20.c	modified	+2	−2	View file
drivers/pinctrl/pinctrl-tegra30.c	modified	+2	−2	View file
drivers/pinctrl/pinctrl-u300.c	modified	+2	−2	View file
drivers/pinctrl/spear/pinctrl-spear.c	modified	+1	−1	View file
drivers/pinctrl/spear/pinctrl-spear.h	modified	+1	−1	View file
drivers/pinctrl/spear/pinctrl-spear1310.c	modified	+3	−3	View file
drivers/pinctrl/spear/pinctrl-spear1340.c	modified	+3	−3	View file
drivers/pinctrl/spear/pinctrl-spear300.c	modified	+3	−3	View file
drivers/pinctrl/spear/pinctrl-spear310.c	modified	+3	−3	View file
drivers/pinctrl/spear/pinctrl-spear320.c	modified	+3	−3	View file
drivers/pnp/pnpbios/core.c	modified	+7	−13	View file
drivers/power/88pm860x_battery.c	modified	+3	−3	View file
drivers/power/88pm860x_charger.c	modified	+3	−3	View file
drivers/power/ab8500_btemp.c	modified	+3	−3	View file
drivers/power/ab8500_charger.c	modified	+3	−3	View file
drivers/power/ab8500_fg.c	modified	+3	−3	View file
drivers/power/abx500_chargalg.c	modified	+3	−3	View file
drivers/power/avs/smartreflex.c	modified	+4	−4	View file
drivers/power/bq27x00_battery.c	modified	+3	−3	View file
drivers/power/charger-manager.c	modified	+2	−2	View file
drivers/power/collie_battery.c	modified	+3	−3	View file
drivers/power/da9052-battery.c	modified	+3	−3	View file
drivers/power/ds2780_battery.c	modified	+3	−3	View file
drivers/power/ds2781_battery.c	modified	+3	−3	View file
drivers/power/generic-adc-battery.c	modified	+3	−3	View file
drivers/power/gpio-charger.c	modified	+3	−3	View file
drivers/power/intel_mid_battery.c	modified	+4	−4	View file
drivers/power/isp1704_charger.c	modified	+3	−3	View file
drivers/power/jz4740-battery.c	modified	+3	−3	View file
drivers/power/lp8727_charger.c	modified	+2	−2	View file
drivers/power/lp8788-charger.c	modified	+3	−3	View file
drivers/power/max17040_battery.c	modified	+3	−3	View file
drivers/power/max17042_battery.c	modified	+3	−3	View file
drivers/power/max8903_charger.c	modified	+3	−3	View file
drivers/power/max8925_power.c	modified	+5	−5	View file
drivers/power/max8997_charger.c	modified	+3	−3	View file
drivers/power/max8998_charger.c	modified	+3	−3	View file
drivers/power/olpc_battery.c	modified	+3	−3	View file
drivers/power/pcf50633-charger.c	modified	+3	−3	View file
drivers/power/s3c_adc_battery.c	modified	+1	−1	View file
drivers/power/sbs-battery.c	modified	+3	−3	View file
drivers/power/smb347-charger.c	modified	+1	−1	View file
drivers/power/tosa_battery.c	modified	+3	−3	View file
drivers/power/wm831x_backup.c	modified	+3	−3	View file
drivers/power/wm831x_power.c	modified	+3	−3	View file
drivers/power/wm8350_power.c	modified	+3	−3	View file
drivers/power/wm97xx_battery.c	modified	+3	−3	View file
drivers/power/z2_battery.c	modified	+3	−3	View file
drivers/ptp/ptp_pch.c	modified	+2	−2	View file
drivers/pwm/pwm-ab8500.c	modified	+3	−3	View file
drivers/pwm/pwm-bfin.c	modified	+2	−2	View file
drivers/pwm/pwm-imx.c	modified	+3	−3	View file
drivers/pwm/pwm-jz4740.c	modified	+3	−3	View file
drivers/pwm/pwm-lpc32xx.c	modified	+2	−2	View file
drivers/pwm/pwm-mxs.c	modified	+2	−2	View file
drivers/pwm/pwm-puv3.c	modified	+3	−3	View file
drivers/pwm/pwm-pxa.c	modified	+3	−3	View file
drivers/pwm/pwm-samsung.c	modified	+2	−2	View file
drivers/pwm/pwm-tegra.c	modified	+2	−2	View file
drivers/pwm/pwm-tiecap.c	modified	+3	−3	View file
drivers/pwm/pwm-tiehrpwm.c	modified	+3	−3	View file
drivers/pwm/pwm-twl6030.c	modified	+1	−1	View file
drivers/rapidio/devices/tsi721.c	modified	+2	−2	View file
drivers/rapidio/devices/tsi721.h	modified	+1	−1	View file
drivers/rapidio/devices/tsi721_dma.c	modified	+1	−1	View file
drivers/rapidio/rio-scan.c	modified	+7	−7	View file
drivers/rapidio/rio.c	modified	+3	−3	View file
drivers/video/backlight/adp5520_bl.c	modified	+3	−3	View file
drivers/video/backlight/adp8860_bl.c	modified	+7	−7	View file
drivers/video/backlight/adp8870_bl.c	modified	+7	−7	View file
drivers/video/backlight/ams369fg06.c	modified	+3	−3	View file
drivers/video/backlight/apple_bl.c	modified	+2	−2	View file
drivers/video/backlight/corgi_lcd.c	modified	+3	−3	View file
drivers/video/backlight/ep93xx_bl.c	modified	+1	−1	View file
drivers/video/backlight/hp680_bl.c	modified	+1	−1	View file
drivers/video/backlight/ili9320.c	modified	+2	−2	View file
drivers/video/backlight/l4f00242t03.c	modified	+3	−3	View file
drivers/video/backlight/ld9040.c	modified	+2	−2	View file
drivers/video/backlight/lm3533_bl.c	modified	+4	−4	View file
drivers/video/backlight/lm3630_bl.c	modified	+4	−4	View file
drivers/video/backlight/lm3639_bl.c	modified	+4	−4	View file
drivers/video/backlight/lms283gf05.c	modified	+3	−3	View file
drivers/video/backlight/lp855x_bl.c	modified	+2	−2	View file
drivers/video/backlight/ltv350qv.c	modified	+3	−3	View file
drivers/video/backlight/max8925_bl.c	modified	+3	−3	View file
drivers/video/backlight/pcf50633-backlight.c	modified	+3	−3	View file
drivers/video/backlight/platform_lcd.c	modified	+3	−3	View file
drivers/video/backlight/s6e63m0.c	modified	+3	−3	View file
drivers/video/backlight/tdo24m.c	modified	+3	−3	View file
drivers/video/backlight/tosa_bl.c	modified	+3	−3	View file
drivers/video/backlight/tosa_lcd.c	modified	+3	−3	View file
drivers/video/backlight/vgg2432a4.c	modified	+3	−3	View file
drivers/watchdog/acquirewdt.c	modified	+3	−3	View file
drivers/watchdog/advantechwdt.c	modified	+3	−3	View file
drivers/watchdog/ar7_wdt.c	modified	+3	−3	View file
drivers/watchdog/at91rm9200_wdt.c	modified	+3	−3	View file
drivers/watchdog/ath79_wdt.c	modified	+3	−3	View file
drivers/watchdog/bcm63xx_wdt.c	modified	+3	−3	View file
drivers/watchdog/bfin_wdt.c	modified	+3	−3	View file
drivers/watchdog/cpu5wdt.c	modified	+4	−4	View file
drivers/watchdog/cpwd.c	modified	+3	−3	View file
drivers/watchdog/da9052_wdt.c	modified	+3	−3	View file
drivers/watchdog/davinci_wdt.c	modified	+3	−3	View file
drivers/watchdog/dw_wdt.c	modified	+3	−3	View file
drivers/watchdog/ep93xx_wdt.c	modified	+3	−3	View file
drivers/watchdog/gef_wdt.c	modified	+2	−2	View file
drivers/watchdog/geodewdt.c	modified	+3	−3	View file
drivers/watchdog/hpwdt.c	modified	+15	−15	View file
drivers/watchdog/i6300esb.c	modified	+5	−5	View file
drivers/watchdog/iTCO_wdt.c	modified	+4	−4	View file
drivers/watchdog/ib700wdt.c	modified	+3	−3	View file
drivers/watchdog/ie6xx_wdt.c	modified	+5	−5	View file
drivers/watchdog/jz4740_wdt.c	modified	+3	−3	View file
drivers/watchdog/ks8695_wdt.c	modified	+3	−3	View file
drivers/watchdog/lantiq_wdt.c	modified	+3	−3	View file
drivers/watchdog/max63xx_wdt.c	modified	+3	−3	View file
drivers/watchdog/mixcomwd.c	modified	+1	−1	View file
drivers/watchdog/mpc8xxx_wdt.c	modified	+3	−3	View file
drivers/watchdog/mpcore_wdt.c	modified	+3	−3	View file
drivers/watchdog/mtx-1_wdt.c	modified	+3	−3	View file
drivers/watchdog/mv64x60_wdt.c	modified	+3	−3	View file
drivers/watchdog/nuc900_wdt.c	modified	+3	−3	View file
drivers/watchdog/nv_tco.c	modified	+5	−5	View file
drivers/watchdog/of_xilinx_wdt.c	modified	+4	−4	View file
drivers/watchdog/omap_wdt.c	modified	+3	−3	View file
drivers/watchdog/orion_wdt.c	modified	+4	−4	View file
drivers/watchdog/pcwd.c	modified	+4	−4	View file
drivers/watchdog/pcwd_pci.c	modified	+3	−3	View file
drivers/watchdog/pnx4008_wdt.c	modified	+3	−3	View file
drivers/watchdog/rc32434_wdt.c	modified	+3	−3	View file
drivers/watchdog/rdc321x_wdt.c	modified	+3	−3	View file
drivers/watchdog/riowd.c	modified	+3	−3	View file
drivers/watchdog/s3c2410_wdt.c	modified	+3	−3	View file
drivers/watchdog/sch311x_wdt.c	modified	+3	−3	View file
drivers/watchdog/shwdt.c	modified	+3	−3	View file
drivers/watchdog/sp5100_tco.c	modified	+5	−5	View file
drivers/watchdog/sp805_wdt.c	modified	+3	−3	View file
drivers/watchdog/stmp3xxx_wdt.c	modified	+3	−3	View file
drivers/watchdog/ts72xx_wdt.c	modified	+3	−3	View file
drivers/watchdog/twl4030_wdt.c	modified	+3	−3	View file
drivers/watchdog/via_wdt.c	modified	+3	−3	View file
drivers/watchdog/wdt_pci.c	modified	+3	−3	View file
drivers/watchdog/wm831x_wdt.c	modified	+3	−3	View file
drivers/watchdog/wm8350_wdt.c	modified	+3	−3	View file
drivers/watchdog/xen_wdt.c	modified	+3	−3	View file
fs/debugfs/inode.c	modified	+0	−1	View file
fs/sysfs/file.c	modified	+2	−2	View file
include/linux/init.h	modified	+7	−11	View file
include/linux/kobject.h	modified	+0	−18	View file
include/linux/mfd/88pm80x.h	modified	+1	−1	View file
include/linux/mfd/abx500/ab8500.h	modified	+2	−2	View file
include/linux/mfd/pm8xxx/irq.h	modified	+4	−4	View file
include/linux/pci.h	modified	+3	−5	View file
kernel/ksysfs.c	modified	+1	−4	View file
kernel/sysctl.c	modified	+2	−2	View file
lib/Makefile	modified	+1	−2	View file
scripts/mod/modpost.c	modified	+10	−14	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/firmware_class/README

View file

diff --git a/Documentation/firmware_class/README b/Documentation/firmware_class/README
index 815b711..43fada9 100644
--- a/Documentation/firmware_class/README
+++ b/Documentation/firmware_class/README
@@ -22,12 +22,17 @@
 	- calls request_firmware(&fw_entry, $FIRMWARE, device)
 	- kernel searchs the fimware image with name $FIRMWARE directly
 	in the below search path of root filesystem:
+		User customized search path by module parameter 'path'[1]
 		"/lib/firmware/updates/" UTS_RELEASE,
 		"/lib/firmware/updates",
 		"/lib/firmware/" UTS_RELEASE,
 		"/lib/firmware"
 	- If found, goto 7), else goto 2)
 
+	[1], the 'path' is a string parameter which length should be less
+	than 256, user should pass 'firmware_class.path=$CUSTOMIZED_PATH'
+	if firmware_class is built in kernel(the general situation)
+
  2), userspace:
  	- /sys/class/firmware/xxx/{loading,data} appear.
 	- hotplug gets called with a firmware identifier in $FIRMWARE
@@ -114,3 +119,10 @@
    on the setup, so I think that the choice on what firmware to make
    persistent should be left to userspace.
 
+ about firmware cache:
+ --------------------
+ After firmware cache mechanism is introduced during system sleep,
+ request_firmware can be called safely inside device's suspend and
+ resume callback, and callers need't cache the firmware by
+ themselves any more for dealing with firmware loss during system
+ resume.

Documentation/zh_CN/arm/kernel_user_helpers.txt

View file

diff --git a/Documentation/zh_CN/arm/kernel_user_helpers.txt b/Documentation/zh_CN/arm/kernel_user_helpers.txt
new file mode 100644
index 0000000..cd7fc8f
--- /dev/null
+++ b/Documentation/zh_CN/arm/kernel_user_helpers.txt
@@ -0,0 +1,284 @@
+Chinese translated version of Documentation/arm/kernel_user_helpers.txt
+
+If you have any comment or update to the content, please contact the
+original document maintainer directly.  However, if you have a problem
+communicating in English you can also ask the Chinese maintainer for
+help.  Contact the Chinese maintainer if this translation is outdated
+or if there is a problem with the translation.
+
+Maintainer: Nicolas Pitre <[email protected]>
+		Dave Martin <[email protected]>
+Chinese maintainer: Fu Wei <[email protected]>
+---------------------------------------------------------------------
+Documentation/arm/kernel_user_helpers.txt 的中文翻译
+
+如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文
+交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻
+译存在问题，请联系中文版维护者。
+英文版维护者： Nicolas Pitre <[email protected]>
+		Dave Martin <[email protected]>
+中文版维护者： 傅炜 Fu Wei <[email protected]>
+中文版翻译者： 傅炜 Fu Wei <[email protected]>
+中文版校译者： 宋冬生 Dongsheng Song <[email protected]>
+		傅炜 Fu Wei <[email protected]>
+
+
+以下为正文
+---------------------------------------------------------------------
+内核提供的用户空间辅助代码
+=========================
+
+在内核内存空间的固定地址处，有一个由内核提供并可从用户空间访问的代码
+段。它用于向用户空间提供因在许多 ARM CPU 中未实现的特性和/或指令而需
+内核提供帮助的某些操作。这些代码直接在用户模式下执行的想法是为了获得
+最佳效率，但那些与内核计数器联系过于紧密的部分，则被留给了用户库实现。
+事实上，此代码甚至可能因不同的 CPU 而异，这取决于其可用的指令集或它
+是否为 SMP 系统。换句话说，内核保留在不作出警告的情况下根据需要更改
+这些代码的权利。只有本文档描述的入口及其结果是保证稳定的。
+
+这与完全成熟的 VDSO 实现不同（但两者并不冲突），尽管如此，VDSO 可阻止
+某些通过常量高效跳转到那些代码段的汇编技巧。且由于那些代码段在返回用户
+代码前仅使用少量的代码周期，则一个 VDSO 间接远程调用将会在这些简单的
+操作上增加一个可测量的开销。
+
+在对那些拥有原生支持的新型处理器进行代码优化时，仅在已为其他操作使用
+了类似的新增指令，而导致二进制结果已与早期 ARM 处理器不兼容的情况下，
+用户空间才应绕过这些辅助代码，并在内联函数中实现这些操作（无论是通过
+编译器在代码中直接放置，还是作为库函数调用实现的一部分）。也就是说，
+如果你编译的代码不会为了其他目的使用新指令，则不要仅为了避免使用这些
+内核辅助代码，导致二进制程序无法在早期处理器上运行。
+
+新的辅助代码可能随着时间的推移而增加，所以新内核中的某些辅助代码在旧
+内核中可能不存在。因此，程序必须在对任何辅助代码调用假设是安全之前，
+检测 __kuser_helper_version 的值（见下文）。理想情况下，这种检测应该
+只在进程启动时执行一次；如果内核版本不支持所需辅助代码，则该进程可尽早
+中止执行。
+
+kuser_helper_version
+--------------------
+
+位置:	0xffff0ffc
+
+参考声明:
+
+  extern int32_t __kuser_helper_version;
+
+定义:
+
+  这个区域包含了当前运行内核实现的辅助代码版本号。用户空间可以通过读
+  取此版本号以确定特定的辅助代码是否存在。
+
+使用范例:
+
+#define __kuser_helper_version (*(int32_t *)0xffff0ffc)
+
+void check_kuser_version(void)
+{
+	if (__kuser_helper_version < 2) {
+		fprintf(stderr, "can't do atomic operations, kernel too old\n");
+		abort();
+	}
+}
+
+注意:
+
+  用户空间可以假设这个域的值不会在任何单个进程的生存期内改变。也就
+  是说，这个域可以仅在库的初始化阶段或进程启动阶段读取一次。
+
+kuser_get_tls
+-------------
+
+位置:	0xffff0fe0
+
+参考原型:
+
+  void * __kuser_get_tls(void);
+
+输入:
+
+  lr = 返回地址
+
+输出:
+
+  r0 = TLS 值
+
+被篡改的寄存器:
+
+  无
+
+定义:
+
+  获取之前通过 __ARM_NR_set_tls 系统调用设置的 TLS 值。
+
+使用范例:
+
+typedef void * (__kuser_get_tls_t)(void);
+#define __kuser_get_tls (*(__kuser_get_tls_t *)0xffff0fe0)
+
+void foo()
+{
+	void *tls = __kuser_get_tls();
+	printf("TLS = %p\n", tls);
+}
+
+注意:
+
+  - 仅在 __kuser_helper_version >= 1 时，此辅助代码存在
+    （从内核版本 2.6.12 开始）。
+
+kuser_cmpxchg
+-------------
+
+位置:	0xffff0fc0
+
+参考原型:
+
+  int __kuser_cmpxchg(int32_t oldval, int32_t newval, volatile int32_t *ptr);
+
+输入:
+
+  r0 = oldval
+  r1 = newval
+  r2 = ptr
+  lr = 返回地址
+
+输出:
+
+  r0 = 成功代码 (零或非零)
+  C flag = 如果 r0 == 0 则置 1，如果 r0 != 0 则清零。
+
+被篡改的寄存器:
+
+  r3, ip, flags
+
+定义:
+
+  仅在 *ptr 为 oldval 时原子保存 newval 于 *ptr 中。
+  如果 *ptr 被改变，则返回值为零，否则为非零值。
+  如果 *ptr 被改变，则 C flag 也会被置 1，以实现调用代码中的汇编
+  优化。
+
+使用范例:
+
+typedef int (__kuser_cmpxchg_t)(int oldval, int newval, volatile int *ptr);
+#define __kuser_cmpxchg (*(__kuser_cmpxchg_t *)0xffff0fc0)
+
+int atomic_add(volatile int *ptr, int val)
+{
+	int old, new;
+
+	do {
+		old = *ptr;
+		new = old + val;
+	} while(__kuser_cmpxchg(old, new, ptr));
+
+	return new;
+}
+
+注意:
+
+  - 这个例程已根据需要包含了内存屏障。
+
+  - 仅在 __kuser_helper_version >= 2 时，此辅助代码存在
+    （从内核版本 2.6.12 开始）。
+
+kuser_memory_barrier
+--------------------
+
+位置:	0xffff0fa0
+
+参考原型:
+
+  void __kuser_memory_barrier(void);
+
+输入:
+
+  lr = 返回地址
+
+输出:
+
+  无
+
+被篡改的寄存器:
+
+  无
+
+定义:
+
+  应用于任何需要内存屏障以防止手动数据修改带来的一致性问题，以及
+  __kuser_cmpxchg 中。
+
+使用范例:
+
+typedef void (__kuser_dmb_t)(void);
+#define __kuser_dmb (*(__kuser_dmb_t *)0xffff0fa0)
+
+注意:
+
+  - 仅在 __kuser_helper_version >= 3 时，此辅助代码存在
+    （从内核版本 2.6.15 开始）。
+
+kuser_cmpxchg64
+---------------
+
+位置:	0xffff0f60
+
+参考原型:
+
+  int __kuser_cmpxchg64(const int64_t *oldval,
+                        const int64_t *newval,
+                        volatile int64_t *ptr);
+
+输入:
+
+  r0 = 指向 oldval
+  r1 = 指向 newval
+  r2 = 指向目标值
+  lr = 返回地址
+
+输出:
+
+  r0 = 成功代码 (零或非零)
+  C flag = 如果 r0 == 0 则置 1，如果 r0 != 0 则清零。
+
+被篡改的寄存器:
+
+  r3, lr, flags
+
+定义:
+
+  仅在 *ptr 等于 *oldval 指向的 64 位值时，原子保存 *newval
+  指向的 64 位值于 *ptr 中。如果 *ptr 被改变，则返回值为零，
+  否则为非零值。
+
+  如果 *ptr 被改变，则 C flag 也会被置 1，以实现调用代码中的汇编
+  优化。
+
+使用范例:
+
+typedef int (__kuser_cmpxchg64_t)(const int64_t *oldval,
+                                  const int64_t *newval,
+                                  volatile int64_t *ptr);
+#define __kuser_cmpxchg64 (*(__kuser_cmpxchg64_t *)0xffff0f60)
+
+int64_t atomic_add64(volatile int64_t *ptr, int64_t val)
+{
+	int64_t old, new;
+
+	do {
+		old = *ptr;
+		new = old + val;
+	} while(__kuser_cmpxchg64(&old, &new, ptr));
+
+	return new;
+}
+
+注意:
+
+  - 这个例程已根据需要包含了内存屏障。
+
+  - 由于这个过程的代码长度（此辅助代码跨越 2 个常规的 kuser “槽”），
+    因此 0xffff0f80 不被作为有效的入口点。
+
+  - 仅在 __kuser_helper_version >= 5 时，此辅助代码存在
+    （从内核版本 3.1 开始）。

Documentation/zh_CN/arm64/memory.txt

View file

diff --git a/Documentation/zh_CN/arm64/memory.txt b/Documentation/zh_CN/arm64/memory.txt
index 83b5193..a5f6283 100644
--- a/Documentation/zh_CN/arm64/memory.txt
+++ b/Documentation/zh_CN/arm64/memory.txt
@@ -47,21 +47,21 @@ AArch64 Linux 内存布局：
 -----------------------------------------------------------------------
 0000000000000000	0000007fffffffff	 512GB		用户空间
 
-ffffff8000000000	ffffffbbfffcffff	~240GB		vmalloc
+ffffff8000000000	ffffffbbfffeffff	~240GB		vmalloc
 
-ffffffbbfffd0000	ffffffbcfffdffff	  64KB		[防护页]
+ffffffbbffff0000	ffffffbbffffffff	  64KB		[防护页]
 
-ffffffbbfffe0000	ffffffbcfffeffff	  64KB		PCI I/O 空间
+ffffffbc00000000	ffffffbdffffffff	   8GB		vmemmap
 
-ffffffbbffff0000	ffffffbcffffffff	  64KB		[防护页]
+ffffffbe00000000	ffffffbffbbfffff	  ~8GB		[防护页，未来用于 vmmemap]
 
-ffffffbc00000000	ffffffbdffffffff	   8GB		vmemmap
+ffffffbffbe00000	ffffffbffbe0ffff	  64KB		PCI I/O 空间
 
-ffffffbe00000000	ffffffbffbffffff	  ~8GB		[防护页，未来用于 vmmemap]
+ffffffbbffff0000	ffffffbcffffffff	  ~2MB		[防护页]
 
 ffffffbffc000000	ffffffbfffffffff	  64MB		模块
 
-ffffffc000000000	ffffffffffffffff	 256GB		内存空间
+ffffffc000000000	ffffffffffffffff	 256GB		内核逻辑内存映射
 
 
 4KB 页大小的转换表查找：

arch/microblaze/pci/pci-common.c

View file

diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
index 4dbb505..a1c5b99 100644
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -1346,8 +1346,6 @@ void __init pcibios_resource_survey(void)
 	pci_assign_unassigned_resources();
 }
 
-#ifdef CONFIG_HOTPLUG
-
 /* This is used by the PCI hotplug driver to allocate resource
  * of newly plugged busses. We can try to consolidate with the
  * rest of the code later, for now, keep it as-is as our main
@@ -1407,8 +1405,6 @@ void pcibios_finish_adding_to_bus(struct pci_bus *bus)
 }
 EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);
 
-#endif /* CONFIG_HOTPLUG */
-
 int pcibios_enable_device(struct pci_dev *dev, int mask)
 {
 	return pci_enable_resources(dev, mask);

arch/mips/pci/pci.c

View file

diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 04e35bc..4040416 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -313,10 +313,8 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
 	}
 }
 
-#ifdef CONFIG_HOTPLUG
 EXPORT_SYMBOL(PCIBIOS_MIN_IO);
 EXPORT_SYMBOL(PCIBIOS_MIN_MEM);
-#endif
 
 int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
 			enum pci_mmap_state mmap_state, int write_combine)

arch/powerpc/kernel/pci-common.c

View file

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 7f94f76..abc0d08 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1428,8 +1428,6 @@ void __init pcibios_resource_survey(void)
 		ppc_md.pcibios_fixup();
 }
 
-#ifdef CONFIG_HOTPLUG
-
 /* This is used by the PCI hotplug driver to allocate resource
  * of newly plugged busses. We can try to consolidate with the
  * rest of the code later, for now, keep it as-is as our main
@@ -1488,8 +1486,6 @@ void pcibios_finish_adding_to_bus(struct pci_bus *bus)
 }
 EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);
 
-#endif /* CONFIG_HOTPLUG */
-
 int pcibios_enable_device(struct pci_dev *dev, int mask)
 {
 	if (ppc_md.pcibios_enable_device_hook)

arch/powerpc/kernel/pci_64.c

View file

diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 4ff190f..2cbe676 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -74,8 +74,6 @@ static int __init pcibios_init(void)
 
 subsys_initcall(pcibios_init);
 
-#ifdef CONFIG_HOTPLUG
-
 int pcibios_unmap_io_space(struct pci_bus *bus)
 {
 	struct pci_controller *hose;
@@ -124,8 +122,6 @@ int pcibios_unmap_io_space(struct pci_bus *bus)
 }
 EXPORT_SYMBOL_GPL(pcibios_unmap_io_space);
 
-#endif /* CONFIG_HOTPLUG */
-
 static int __devinit pcibios_map_phb_io_space(struct pci_controller *hose)
 {
 	struct vm_struct *area;

arch/sh/drivers/pci/pci.c

View file

diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index a7e078f..81e5daf 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -319,7 +319,5 @@ EXPORT_SYMBOL(pci_iounmap);
 
 #endif /* CONFIG_GENERIC_IOMAP */
 
-#ifdef CONFIG_HOTPLUG
 EXPORT_SYMBOL(PCIBIOS_MIN_IO);
 EXPORT_SYMBOL(PCIBIOS_MIN_MEM);
-#endif

arch/unicore32/kernel/pci.c

View file

diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c
index b0056f6..7c43592 100644
--- a/arch/unicore32/kernel/pci.c
+++ b/arch/unicore32/kernel/pci.c
@@ -250,9 +250,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
 	printk(KERN_INFO "PCI: bus%d: Fast back to back transfers %sabled\n",
 		bus->number, (features & PCI_COMMAND_FAST_BACK) ? "en" : "dis");
 }
-#ifdef CONFIG_HOTPLUG
 EXPORT_SYMBOL(pcibios_fixup_bus);
-#endif
 
 static int __init pci_common_init(void)
 {

drivers/acpi/apei/ghes.c

View file

diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index da93c00..7ae2750 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -901,7 +901,7 @@ static unsigned long ghes_esource_prealloc_size(
 	return prealloc_size;
 }
 
-static int __devinit ghes_probe(struct platform_device *ghes_dev)
+static int ghes_probe(struct platform_device *ghes_dev)
 {
 	struct acpi_hest_generic *generic;
 	struct ghes *ghes = NULL;

drivers/acpi/hed.c

View file

diff --git a/drivers/acpi/hed.c b/drivers/acpi/hed.c
index b514e81..a0cc796 100644
--- a/drivers/acpi/hed.c
+++ b/drivers/acpi/hed.c
@@ -61,7 +61,7 @@ static void acpi_hed_notify(struct acpi_device *device, u32 event)
 	blocking_notifier_call_chain(&acpi_hed_notify_list, 0, NULL);
 }
 
-static int __devinit acpi_hed_add(struct acpi_device *device)
+static int acpi_hed_add(struct acpi_device *device)
 {
 	/* Only one hardware error device */
 	if (hed_handle)

drivers/acpi/pci_root.c

View file

diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index bce469c..f70b9e5 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -445,7 +445,7 @@ out:
 }
 EXPORT_SYMBOL(acpi_pci_osc_control_set);
 
-static int __devinit acpi_pci_root_add(struct acpi_device *device)
+static int acpi_pci_root_add(struct acpi_device *device)
 {
 	unsigned long long segment, bus;
 	acpi_status status;

drivers/base/Kconfig

View file

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index b34b5cd..c8b4539 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -57,7 +57,7 @@ config DEVTMPFS_MOUNT
 	  on the rootfs is completely empty.
 
 config STANDALONE
-	bool "Select only drivers that don't need compile-time external firmware" if EXPERIMENTAL
+	bool "Select only drivers that don't need compile-time external firmware"
 	default y
 	help
 	  Select this option if you don't have magic firmware for drivers that
@@ -185,7 +185,6 @@ config DMA_SHARED_BUFFER
 	bool
 	default n
 	select ANON_INODES
-	depends on EXPERIMENTAL
 	help
 	  This option enables the framework for buffer-sharing between
 	  multiple drivers. A buffer is associated with a file using driver
@@ -193,8 +192,8 @@ config DMA_SHARED_BUFFER
 	  driver.
 
 config CMA
-	bool "Contiguous Memory Allocator (EXPERIMENTAL)"
-	depends on HAVE_DMA_CONTIGUOUS && HAVE_MEMBLOCK && EXPERIMENTAL
+	bool "Contiguous Memory Allocator"
+	depends on HAVE_DMA_CONTIGUOUS && HAVE_MEMBLOCK
 	select MIGRATION
 	select MEMORY_ISOLATION
 	help

drivers/base/attribute_container.c

View file

diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index 8fc200b..d78b204 100644
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -158,7 +158,7 @@ attribute_container_add_device(struct device *dev,
 
 		ic = kzalloc(sizeof(*ic), GFP_KERNEL);
 		if (!ic) {
-			dev_printk(KERN_ERR, dev, "failed to allocate class container\n");
+			dev_err(dev, "failed to allocate class container\n");
 			continue;
 		}
 

drivers/base/bus.c

View file

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 181ed26..24eb078 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -164,8 +164,6 @@ static const struct kset_uevent_ops bus_uevent_ops = {
 
 static struct kset *bus_kset;
 
-
-#ifdef CONFIG_HOTPLUG
 /* Manually detach a device from its associated driver. */
 static ssize_t driver_unbind(struct device_driver *drv,
 			     const char *buf, size_t count)
@@ -252,7 +250,6 @@ static ssize_t store_drivers_probe(struct bus_type *bus,
 		return -EINVAL;
 	return count;
 }
-#endif
 
 static struct device *next_device(struct klist_iter *i)
 {
@@ -618,11 +615,6 @@ static void driver_remove_attrs(struct bus_type *bus,
 	}
 }
 
-#ifdef CONFIG_HOTPLUG
-/*
- * Thanks to drivers making their tables __devinit, we can't allow manual
- * bind and unbind from userspace unless CONFIG_HOTPLUG is enabled.
- */
 static int __must_check add_bind_files(struct device_driver *drv)
 {
 	int ret;
@@ -666,12 +658,6 @@ static void remove_probe_files(struct bus_type *bus)
 	bus_remove_file(bus, &bus_attr_drivers_autoprobe);
 	bus_remove_file(bus, &bus_attr_drivers_probe);
 }
-#else
-static inline int add_bind_files(struct device_driver *drv) { return 0; }
-static inline void remove_bind_files(struct device_driver *drv) {}
-static inline int add_probe_files(struct bus_type *bus) { return 0; }
-static inline void remove_probe_files(struct bus_type *bus) {}
-#endif
 
 static ssize_t driver_uevent_store(struct device_driver *drv,
 				   const char *buf, size_t count)

drivers/base/core.c

View file

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 150a415..4179139 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1399,7 +1399,7 @@ struct root_device {
 	struct module *owner;
 };

This diff is incomplete. Download the complete patch.