diff options
206 files changed, 4045 insertions, 1655 deletions
diff --git a/Documentation/powerpc/transactional_memory.txt b/Documentation/powerpc/transactional_memory.txt index c907be41d60f..dc23e58ae264 100644 --- a/Documentation/powerpc/transactional_memory.txt +++ b/Documentation/powerpc/transactional_memory.txt | |||
| @@ -147,6 +147,25 @@ Example signal handler: | |||
| 147 | fix_the_problem(ucp->dar); | 147 | fix_the_problem(ucp->dar); |
| 148 | } | 148 | } |
| 149 | 149 | ||
| 150 | When in an active transaction that takes a signal, we need to be careful with | ||
| 151 | the stack. It's possible that the stack has moved back up after the tbegin. | ||
| 152 | The obvious case here is when the tbegin is called inside a function that | ||
| 153 | returns before a tend. In this case, the stack is part of the checkpointed | ||
| 154 | transactional memory state. If we write over this non transactionally or in | ||
| 155 | suspend, we are in trouble because if we get a tm abort, the program counter and | ||
| 156 | stack pointer will be back at the tbegin but our in memory stack won't be valid | ||
| 157 | anymore. | ||
| 158 | |||
| 159 | To avoid this, when taking a signal in an active transaction, we need to use | ||
| 160 | the stack pointer from the checkpointed state, rather than the speculated | ||
| 161 | state. This ensures that the signal context (written tm suspended) will be | ||
| 162 | written below the stack required for the rollback. The transaction is aborted | ||
| 163 | becuase of the treclaim, so any memory written between the tbegin and the | ||
| 164 | signal will be rolled back anyway. | ||
| 165 | |||
| 166 | For signals taken in non-TM or suspended mode, we use the | ||
| 167 | normal/non-checkpointed stack pointer. | ||
| 168 | |||
| 150 | 169 | ||
| 151 | Failure cause codes used by kernel | 170 | Failure cause codes used by kernel |
| 152 | ================================== | 171 | ================================== |
| @@ -155,14 +174,18 @@ These are defined in <asm/reg.h>, and distinguish different reasons why the | |||
| 155 | kernel aborted a transaction: | 174 | kernel aborted a transaction: |
| 156 | 175 | ||
| 157 | TM_CAUSE_RESCHED Thread was rescheduled. | 176 | TM_CAUSE_RESCHED Thread was rescheduled. |
| 177 | TM_CAUSE_TLBI Software TLB invalide. | ||
| 158 | TM_CAUSE_FAC_UNAV FP/VEC/VSX unavailable trap. | 178 | TM_CAUSE_FAC_UNAV FP/VEC/VSX unavailable trap. |
| 159 | TM_CAUSE_SYSCALL Currently unused; future syscalls that must abort | 179 | TM_CAUSE_SYSCALL Currently unused; future syscalls that must abort |
| 160 | transactions for consistency will use this. | 180 | transactions for consistency will use this. |
| 161 | TM_CAUSE_SIGNAL Signal delivered. | 181 | TM_CAUSE_SIGNAL Signal delivered. |
| 162 | TM_CAUSE_MISC Currently unused. | 182 | TM_CAUSE_MISC Currently unused. |
| 183 | TM_CAUSE_ALIGNMENT Alignment fault. | ||
| 184 | TM_CAUSE_EMULATE Emulation that touched memory. | ||
| 163 | 185 | ||
| 164 | These can be checked by the user program's abort handler as TEXASR[0:7]. | 186 | These can be checked by the user program's abort handler as TEXASR[0:7]. If |
| 165 | 187 | bit 7 is set, it indicates that the error is consider persistent. For example | |
| 188 | a TM_CAUSE_ALIGNMENT will be persistent while a TM_CAUSE_RESCHED will not.q | ||
| 166 | 189 | ||
| 167 | GDB | 190 | GDB |
| 168 | === | 191 | === |
diff --git a/MAINTAINERS b/MAINTAINERS index fd3a495a0005..f35a259a6564 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3322,11 +3322,12 @@ F: drivers/net/wan/dlci.c | |||
| 3322 | F: drivers/net/wan/sdla.c | 3322 | F: drivers/net/wan/sdla.c |
| 3323 | 3323 | ||
| 3324 | FRAMEBUFFER LAYER | 3324 | FRAMEBUFFER LAYER |
| 3325 | M: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 3325 | M: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> |
| 3326 | M: Tomi Valkeinen <tomi.valkeinen@ti.com> | ||
| 3326 | L: linux-fbdev@vger.kernel.org | 3327 | L: linux-fbdev@vger.kernel.org |
| 3327 | W: http://linux-fbdev.sourceforge.net/ | 3328 | W: http://linux-fbdev.sourceforge.net/ |
| 3328 | Q: http://patchwork.kernel.org/project/linux-fbdev/list/ | 3329 | Q: http://patchwork.kernel.org/project/linux-fbdev/list/ |
| 3329 | T: git git://github.com/schandinat/linux-2.6.git fbdev-next | 3330 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git |
| 3330 | S: Maintained | 3331 | S: Maintained |
| 3331 | F: Documentation/fb/ | 3332 | F: Documentation/fb/ |
| 3332 | F: Documentation/devicetree/bindings/fb/ | 3333 | F: Documentation/devicetree/bindings/fb/ |
| @@ -6087,7 +6088,15 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git | |||
| 6087 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git | 6088 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git |
| 6088 | S: Maintained | 6089 | S: Maintained |
| 6089 | F: arch/parisc/ | 6090 | F: arch/parisc/ |
| 6091 | F: Documentation/parisc/ | ||
| 6090 | F: drivers/parisc/ | 6092 | F: drivers/parisc/ |
| 6093 | F: drivers/char/agp/parisc-agp.c | ||
| 6094 | F: drivers/input/serio/gscps2.c | ||
| 6095 | F: drivers/parport/parport_gsc.* | ||
| 6096 | F: drivers/tty/serial/8250/8250_gsc.c | ||
| 6097 | F: drivers/video/sti* | ||
| 6098 | F: drivers/video/console/sti* | ||
| 6099 | F: drivers/video/logo/logo_parisc* | ||
| 6091 | 6100 | ||
| 6092 | PC87360 HARDWARE MONITORING DRIVER | 6101 | PC87360 HARDWARE MONITORING DRIVER |
| 6093 | M: Jim Cromie <jim.cromie@gmail.com> | 6102 | M: Jim Cromie <jim.cromie@gmail.com> |
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 3 | 1 | VERSION = 3 |
| 2 | PATCHLEVEL = 10 | 2 | PATCHLEVEL = 10 |
| 3 | SUBLEVEL = 0 | 3 | SUBLEVEL = 0 |
| 4 | EXTRAVERSION = -rc3 | 4 | EXTRAVERSION = -rc4 |
| 5 | NAME = Unicycling Gorilla | 5 | NAME = Unicycling Gorilla |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index 1460d9b88adf..8e1248f01fab 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi | |||
| @@ -409,8 +409,8 @@ | |||
| 409 | ti,hwmods = "gpmc"; | 409 | ti,hwmods = "gpmc"; |
| 410 | reg = <0x50000000 0x2000>; | 410 | reg = <0x50000000 0x2000>; |
| 411 | interrupts = <100>; | 411 | interrupts = <100>; |
| 412 | num-cs = <7>; | 412 | gpmc,num-cs = <7>; |
| 413 | num-waitpins = <2>; | 413 | gpmc,num-waitpins = <2>; |
| 414 | #address-cells = <2>; | 414 | #address-cells = <2>; |
| 415 | #size-cells = <1>; | 415 | #size-cells = <1>; |
| 416 | status = "disabled"; | 416 | status = "disabled"; |
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 98dfc3ea5c0b..0673524238a6 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi | |||
| @@ -497,6 +497,21 @@ | |||
| 497 | clock-names = "usbhost"; | 497 | clock-names = "usbhost"; |
| 498 | }; | 498 | }; |
| 499 | 499 | ||
| 500 | usbphy@12130000 { | ||
| 501 | compatible = "samsung,exynos5250-usb2phy"; | ||
| 502 | reg = <0x12130000 0x100>; | ||
| 503 | clocks = <&clock 1>, <&clock 285>; | ||
| 504 | clock-names = "ext_xtal", "usbhost"; | ||
| 505 | #address-cells = <1>; | ||
| 506 | #size-cells = <1>; | ||
| 507 | ranges; | ||
| 508 | |||
| 509 | usbphy-sys { | ||
| 510 | reg = <0x10040704 0x8>, | ||
| 511 | <0x10050230 0x4>; | ||
| 512 | }; | ||
| 513 | }; | ||
| 514 | |||
| 500 | amba { | 515 | amba { |
| 501 | #address-cells = <1>; | 516 | #address-cells = <1>; |
| 502 | #size-cells = <1>; | 517 | #size-cells = <1>; |
diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi index 03bd60deb52b..eeb734e25709 100644 --- a/arch/arm/boot/dts/omap4-panda-common.dtsi +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi | |||
| @@ -56,9 +56,23 @@ | |||
| 56 | }; | 56 | }; |
| 57 | }; | 57 | }; |
| 58 | 58 | ||
| 59 | &omap4_pmx_wkup { | ||
| 60 | pinctrl-names = "default"; | ||
| 61 | pinctrl-0 = < | ||
| 62 | &twl6030_wkup_pins | ||
| 63 | >; | ||
| 64 | |||
| 65 | twl6030_wkup_pins: pinmux_twl6030_wkup_pins { | ||
| 66 | pinctrl-single,pins = < | ||
| 67 | 0x14 0x2 /* fref_clk0_out.sys_drm_msecure OUTPUT | MODE2 */ | ||
| 68 | >; | ||
| 69 | }; | ||
| 70 | }; | ||
| 71 | |||
| 59 | &omap4_pmx_core { | 72 | &omap4_pmx_core { |
| 60 | pinctrl-names = "default"; | 73 | pinctrl-names = "default"; |
| 61 | pinctrl-0 = < | 74 | pinctrl-0 = < |
| 75 | &twl6030_pins | ||
| 62 | &twl6040_pins | 76 | &twl6040_pins |
| 63 | &mcpdm_pins | 77 | &mcpdm_pins |
| 64 | &mcbsp1_pins | 78 | &mcbsp1_pins |
| @@ -66,6 +80,12 @@ | |||
| 66 | &tpd12s015_pins | 80 | &tpd12s015_pins |
| 67 | >; | 81 | >; |
| 68 | 82 | ||
| 83 | twl6030_pins: pinmux_twl6030_pins { | ||
| 84 | pinctrl-single,pins = < | ||
| 85 | 0x15e 0x4118 /* sys_nirq1.sys_nirq1 OMAP_WAKEUP_EN | INPUT_PULLUP | MODE0 */ | ||
| 86 | >; | ||
| 87 | }; | ||
| 88 | |||
| 69 | twl6040_pins: pinmux_twl6040_pins { | 89 | twl6040_pins: pinmux_twl6040_pins { |
| 70 | pinctrl-single,pins = < | 90 | pinctrl-single,pins = < |
| 71 | 0xe0 0x3 /* hdq_sio.gpio_127 OUTPUT | MODE3 */ | 91 | 0xe0 0x3 /* hdq_sio.gpio_127 OUTPUT | MODE3 */ |
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts index a35d9cd58063..98505a2ef162 100644 --- a/arch/arm/boot/dts/omap4-sdp.dts +++ b/arch/arm/boot/dts/omap4-sdp.dts | |||
| @@ -142,9 +142,23 @@ | |||
| 142 | }; | 142 | }; |
| 143 | }; | 143 | }; |
| 144 | 144 | ||
| 145 | &omap4_pmx_wkup { | ||
| 146 | pinctrl-names = "default"; | ||
| 147 | pinctrl-0 = < | ||
| 148 | &twl6030_wkup_pins | ||
| 149 | >; | ||
| 150 | |||
| 151 | twl6030_wkup_pins: pinmux_twl6030_wkup_pins { | ||
| 152 | pinctrl-single,pins = < | ||
| 153 | 0x14 0x2 /* fref_clk0_out.sys_drm_msecure OUTPUT | MODE2 */ | ||
| 154 | >; | ||
| 155 | }; | ||
| 156 | }; | ||
| 157 | |||
| 145 | &omap4_pmx_core { | 158 | &omap4_pmx_core { |
| 146 | pinctrl-names = "default"; | 159 | pinctrl-names = "default"; |
| 147 | pinctrl-0 = < | 160 | pinctrl-0 = < |
| 161 | &twl6030_pins | ||
| 148 | &twl6040_pins | 162 | &twl6040_pins |
| 149 | &mcpdm_pins | 163 | &mcpdm_pins |
| 150 | &dmic_pins | 164 | &dmic_pins |
| @@ -179,6 +193,12 @@ | |||
| 179 | >; | 193 | >; |
| 180 | }; | 194 | }; |
| 181 | 195 | ||
| 196 | twl6030_pins: pinmux_twl6030_pins { | ||
| 197 | pinctrl-single,pins = < | ||
| 198 | 0x15e 0x4118 /* sys_nirq1.sys_nirq1 OMAP_WAKEUP_EN | INPUT_PULLUP | MODE0 */ | ||
| 199 | >; | ||
| 200 | }; | ||
| 201 | |||
| 182 | twl6040_pins: pinmux_twl6040_pins { | 202 | twl6040_pins: pinmux_twl6040_pins { |
| 183 | pinctrl-single,pins = < | 203 | pinctrl-single,pins = < |
| 184 | 0xe0 0x3 /* hdq_sio.gpio_127 OUTPUT | MODE3 */ | 204 | 0xe0 0x3 /* hdq_sio.gpio_127 OUTPUT | MODE3 */ |
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi index 3dd7ff825828..635cae283011 100644 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/omap5.dtsi | |||
| @@ -538,6 +538,7 @@ | |||
| 538 | interrupts = <0 41 0x4>; | 538 | interrupts = <0 41 0x4>; |
| 539 | ti,hwmods = "timer5"; | 539 | ti,hwmods = "timer5"; |
| 540 | ti,timer-dsp; | 540 | ti,timer-dsp; |
| 541 | ti,timer-pwm; | ||
| 541 | }; | 542 | }; |
| 542 | 543 | ||
| 543 | timer6: timer@4013a000 { | 544 | timer6: timer@4013a000 { |
| @@ -574,6 +575,7 @@ | |||
| 574 | reg = <0x4803e000 0x80>; | 575 | reg = <0x4803e000 0x80>; |
| 575 | interrupts = <0 45 0x4>; | 576 | interrupts = <0 45 0x4>; |
| 576 | ti,hwmods = "timer9"; | 577 | ti,hwmods = "timer9"; |
| 578 | ti,timer-pwm; | ||
| 577 | }; | 579 | }; |
| 578 | 580 | ||
| 579 | timer10: timer@48086000 { | 581 | timer10: timer@48086000 { |
| @@ -581,6 +583,7 @@ | |||
| 581 | reg = <0x48086000 0x80>; | 583 | reg = <0x48086000 0x80>; |
| 582 | interrupts = <0 46 0x4>; | 584 | interrupts = <0 46 0x4>; |
| 583 | ti,hwmods = "timer10"; | 585 | ti,hwmods = "timer10"; |
| 586 | ti,timer-pwm; | ||
| 584 | }; | 587 | }; |
| 585 | 588 | ||
| 586 | timer11: timer@48088000 { | 589 | timer11: timer@48088000 { |
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig index e40b435d204e..227abf9cc601 100644 --- a/arch/arm/configs/exynos_defconfig +++ b/arch/arm/configs/exynos_defconfig | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | CONFIG_EXPERIMENTAL=y | 1 | CONFIG_SYSVIPC=y |
| 2 | CONFIG_NO_HZ=y | 2 | CONFIG_NO_HZ=y |
| 3 | CONFIG_HIGH_RES_TIMERS=y | 3 | CONFIG_HIGH_RES_TIMERS=y |
| 4 | CONFIG_BLK_DEV_INITRD=y | 4 | CONFIG_BLK_DEV_INITRD=y |
| @@ -7,17 +7,18 @@ CONFIG_MODULES=y | |||
| 7 | CONFIG_MODULE_UNLOAD=y | 7 | CONFIG_MODULE_UNLOAD=y |
| 8 | # CONFIG_BLK_DEV_BSG is not set | 8 | # CONFIG_BLK_DEV_BSG is not set |
| 9 | CONFIG_PARTITION_ADVANCED=y | 9 | CONFIG_PARTITION_ADVANCED=y |
| 10 | CONFIG_EFI_PARTITION=y | ||
| 11 | CONFIG_ARCH_EXYNOS=y | 10 | CONFIG_ARCH_EXYNOS=y |
| 12 | CONFIG_S3C_LOWLEVEL_UART_PORT=1 | 11 | CONFIG_S3C_LOWLEVEL_UART_PORT=3 |
| 13 | CONFIG_S3C24XX_PWM=y | 12 | CONFIG_S3C24XX_PWM=y |
| 14 | CONFIG_ARCH_EXYNOS5=y | 13 | CONFIG_ARCH_EXYNOS5=y |
| 15 | CONFIG_MACH_EXYNOS4_DT=y | 14 | CONFIG_MACH_EXYNOS4_DT=y |
| 16 | CONFIG_MACH_EXYNOS5_DT=y | ||
| 17 | CONFIG_SMP=y | 15 | CONFIG_SMP=y |
| 18 | CONFIG_NR_CPUS=2 | 16 | CONFIG_NR_CPUS=2 |
| 19 | CONFIG_PREEMPT=y | 17 | CONFIG_PREEMPT=y |
| 20 | CONFIG_AEABI=y | 18 | CONFIG_AEABI=y |
| 19 | CONFIG_HIGHMEM=y | ||
| 20 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 21 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 21 | CONFIG_ARM_APPENDED_DTB=y | 22 | CONFIG_ARM_APPENDED_DTB=y |
| 22 | CONFIG_ARM_ATAG_DTB_COMPAT=y | 23 | CONFIG_ARM_ATAG_DTB_COMPAT=y |
| 23 | CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M" | 24 | CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M" |
| @@ -30,35 +31,58 @@ CONFIG_NET_KEY=y | |||
| 30 | CONFIG_INET=y | 31 | CONFIG_INET=y |
| 31 | CONFIG_RFKILL_REGULATOR=y | 32 | CONFIG_RFKILL_REGULATOR=y |
| 32 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 33 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 34 | CONFIG_DEVTMPFS=y | ||
| 35 | CONFIG_DEVTMPFS_MOUNT=y | ||
| 33 | CONFIG_PROC_DEVICETREE=y | 36 | CONFIG_PROC_DEVICETREE=y |
| 34 | CONFIG_BLK_DEV_LOOP=y | 37 | CONFIG_BLK_DEV_LOOP=y |
| 38 | CONFIG_BLK_DEV_CRYPTOLOOP=y | ||
| 35 | CONFIG_BLK_DEV_RAM=y | 39 | CONFIG_BLK_DEV_RAM=y |
| 36 | CONFIG_BLK_DEV_RAM_SIZE=8192 | 40 | CONFIG_BLK_DEV_RAM_SIZE=8192 |
| 37 | CONFIG_SCSI=y | 41 | CONFIG_SCSI=y |
| 38 | CONFIG_BLK_DEV_SD=y | 42 | CONFIG_BLK_DEV_SD=y |
| 39 | CONFIG_CHR_DEV_SG=y | 43 | CONFIG_CHR_DEV_SG=y |
| 44 | CONFIG_MD=y | ||
| 45 | CONFIG_BLK_DEV_DM=y | ||
| 46 | CONFIG_DM_CRYPT=m | ||
| 40 | CONFIG_NETDEVICES=y | 47 | CONFIG_NETDEVICES=y |
| 41 | CONFIG_SMSC911X=y | 48 | CONFIG_SMSC911X=y |
| 42 | CONFIG_USB_USBNET=y | 49 | CONFIG_USB_USBNET=y |
| 43 | CONFIG_USB_NET_SMSC75XX=y | 50 | CONFIG_USB_NET_SMSC75XX=y |
| 44 | CONFIG_USB_NET_SMSC95XX=y | 51 | CONFIG_USB_NET_SMSC95XX=y |
| 45 | CONFIG_INPUT_EVDEV=y | 52 | CONFIG_INPUT_EVDEV=y |
| 46 | # CONFIG_INPUT_KEYBOARD is not set | 53 | CONFIG_KEYBOARD_CROS_EC=y |
| 47 | # CONFIG_INPUT_MOUSE is not set | 54 | # CONFIG_MOUSE_PS2 is not set |
| 55 | CONFIG_MOUSE_CYAPA=y | ||
| 48 | CONFIG_INPUT_TOUCHSCREEN=y | 56 | CONFIG_INPUT_TOUCHSCREEN=y |
| 49 | CONFIG_SERIAL_8250=y | 57 | CONFIG_SERIAL_8250=y |
| 50 | CONFIG_SERIAL_SAMSUNG=y | 58 | CONFIG_SERIAL_SAMSUNG=y |
| 51 | CONFIG_SERIAL_SAMSUNG_CONSOLE=y | 59 | CONFIG_SERIAL_SAMSUNG_CONSOLE=y |
| 52 | CONFIG_SERIAL_OF_PLATFORM=y | 60 | CONFIG_SERIAL_OF_PLATFORM=y |
| 53 | CONFIG_HW_RANDOM=y | 61 | CONFIG_HW_RANDOM=y |
| 62 | CONFIG_TCG_TPM=y | ||
| 63 | CONFIG_TCG_TIS_I2C_INFINEON=y | ||
| 54 | CONFIG_I2C=y | 64 | CONFIG_I2C=y |
| 65 | CONFIG_I2C_MUX=y | ||
| 66 | CONFIG_I2C_ARB_GPIO_CHALLENGE=y | ||
| 67 | CONFIG_I2C_S3C2410=y | ||
| 68 | CONFIG_DEBUG_GPIO=y | ||
| 55 | # CONFIG_HWMON is not set | 69 | # CONFIG_HWMON is not set |
| 70 | CONFIG_MFD_CROS_EC=y | ||
| 71 | CONFIG_MFD_CROS_EC_I2C=y | ||
| 72 | CONFIG_MFD_MAX77686=y | ||
| 73 | CONFIG_MFD_MAX8997=y | ||
| 74 | CONFIG_MFD_SEC_CORE=y | ||
| 56 | CONFIG_MFD_TPS65090=y | 75 | CONFIG_MFD_TPS65090=y |
| 57 | CONFIG_REGULATOR=y | 76 | CONFIG_REGULATOR=y |
| 58 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | 77 | CONFIG_REGULATOR_FIXED_VOLTAGE=y |
| 59 | CONFIG_REGULATOR_GPIO=y | 78 | CONFIG_REGULATOR_GPIO=y |
| 79 | CONFIG_REGULATOR_MAX8997=y | ||
| 80 | CONFIG_REGULATOR_MAX77686=y | ||
| 81 | CONFIG_REGULATOR_S5M8767=y | ||
| 60 | CONFIG_REGULATOR_TPS65090=y | 82 | CONFIG_REGULATOR_TPS65090=y |
| 61 | CONFIG_FB=y | 83 | CONFIG_FB=y |
| 84 | CONFIG_FB_MODE_HELPERS=y | ||
| 85 | CONFIG_FB_SIMPLE=y | ||
| 62 | CONFIG_EXYNOS_VIDEO=y | 86 | CONFIG_EXYNOS_VIDEO=y |
| 63 | CONFIG_EXYNOS_MIPI_DSI=y | 87 | CONFIG_EXYNOS_MIPI_DSI=y |
| 64 | CONFIG_EXYNOS_DP=y | 88 | CONFIG_EXYNOS_DP=y |
| @@ -67,6 +91,20 @@ CONFIG_FONTS=y | |||
| 67 | CONFIG_FONT_7x14=y | 91 | CONFIG_FONT_7x14=y |
| 68 | CONFIG_LOGO=y | 92 | CONFIG_LOGO=y |
| 69 | CONFIG_USB=y | 93 | CONFIG_USB=y |
| 94 | CONFIG_USB_EHCI_HCD=y | ||
| 95 | CONFIG_USB_EHCI_S5P=y | ||
| 96 | CONFIG_USB_STORAGE=y | ||
| 97 | CONFIG_USB_DWC3=y | ||
| 98 | CONFIG_USB_PHY=y | ||
| 99 | CONFIG_SAMSUNG_USB2PHY=y | ||
| 100 | CONFIG_SAMSUNG_USB3PHY=y | ||
| 101 | CONFIG_MMC=y | ||
| 102 | CONFIG_MMC_SDHCI=y | ||
| 103 | CONFIG_MMC_SDHCI_S3C=y | ||
| 104 | CONFIG_MMC_DW=y | ||
| 105 | CONFIG_MMC_DW_IDMAC=y | ||
| 106 | CONFIG_MMC_DW_EXYNOS=y | ||
| 107 | CONFIG_COMMON_CLK_MAX77686=y | ||
| 70 | CONFIG_EXT2_FS=y | 108 | CONFIG_EXT2_FS=y |
| 71 | CONFIG_EXT3_FS=y | 109 | CONFIG_EXT3_FS=y |
| 72 | CONFIG_EXT4_FS=y | 110 | CONFIG_EXT4_FS=y |
| @@ -79,6 +117,7 @@ CONFIG_ROMFS_FS=y | |||
| 79 | CONFIG_NLS_CODEPAGE_437=y | 117 | CONFIG_NLS_CODEPAGE_437=y |
| 80 | CONFIG_NLS_ASCII=y | 118 | CONFIG_NLS_ASCII=y |
| 81 | CONFIG_NLS_ISO8859_1=y | 119 | CONFIG_NLS_ISO8859_1=y |
| 120 | CONFIG_PRINTK_TIME=y | ||
| 82 | CONFIG_MAGIC_SYSRQ=y | 121 | CONFIG_MAGIC_SYSRQ=y |
| 83 | CONFIG_DEBUG_KERNEL=y | 122 | CONFIG_DEBUG_KERNEL=y |
| 84 | CONFIG_DETECT_HUNG_TASK=y | 123 | CONFIG_DETECT_HUNG_TASK=y |
| @@ -87,6 +126,5 @@ CONFIG_DEBUG_SPINLOCK=y | |||
| 87 | CONFIG_DEBUG_MUTEXES=y | 126 | CONFIG_DEBUG_MUTEXES=y |
| 88 | CONFIG_DEBUG_INFO=y | 127 | CONFIG_DEBUG_INFO=y |
| 89 | CONFIG_DEBUG_USER=y | 128 | CONFIG_DEBUG_USER=y |
| 90 | CONFIG_DEBUG_LL=y | 129 | CONFIG_CRYPTO_SHA256=y |
| 91 | CONFIG_EARLY_PRINTK=y | ||
| 92 | CONFIG_CRC_CCITT=y | 130 | CONFIG_CRC_CCITT=y |
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index d19edff0ea6e..ff18fc2ea46f 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig | |||
| @@ -250,6 +250,7 @@ config MACH_ARMLEX4210 | |||
| 250 | config MACH_UNIVERSAL_C210 | 250 | config MACH_UNIVERSAL_C210 |
| 251 | bool "Mobile UNIVERSAL_C210 Board" | 251 | bool "Mobile UNIVERSAL_C210 Board" |
| 252 | select CLKSRC_MMIO | 252 | select CLKSRC_MMIO |
| 253 | select CLKSRC_SAMSUNG_PWM | ||
| 253 | select CPU_EXYNOS4210 | 254 | select CPU_EXYNOS4210 |
| 254 | select EXYNOS4_SETUP_FIMC | 255 | select EXYNOS4_SETUP_FIMC |
| 255 | select EXYNOS4_SETUP_FIMD0 | 256 | select EXYNOS4_SETUP_FIMD0 |
| @@ -281,7 +282,6 @@ config MACH_UNIVERSAL_C210 | |||
| 281 | select S5P_DEV_TV | 282 | select S5P_DEV_TV |
| 282 | select S5P_GPIO_INT | 283 | select S5P_GPIO_INT |
| 283 | select S5P_SETUP_MIPIPHY | 284 | select S5P_SETUP_MIPIPHY |
| 284 | select SAMSUNG_HRT | ||
| 285 | help | 285 | help |
| 286 | Machine support for Samsung Mobile Universal S5PC210 Reference | 286 | Machine support for Samsung Mobile Universal S5PC210 Reference |
| 287 | Board. | 287 | Board. |
| @@ -410,6 +410,7 @@ config MACH_EXYNOS4_DT | |||
| 410 | depends on ARCH_EXYNOS4 | 410 | depends on ARCH_EXYNOS4 |
| 411 | select ARM_AMBA | 411 | select ARM_AMBA |
| 412 | select CLKSRC_OF | 412 | select CLKSRC_OF |
| 413 | select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210 | ||
| 413 | select CPU_EXYNOS4210 | 414 | select CPU_EXYNOS4210 |
| 414 | select KEYBOARD_SAMSUNG if INPUT_KEYBOARD | 415 | select KEYBOARD_SAMSUNG if INPUT_KEYBOARD |
| 415 | select PINCTRL | 416 | select PINCTRL |
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 745e304ad0de..027c9e7f0d13 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c | |||
| @@ -10,12 +10,14 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/bitops.h> | ||
| 13 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
| 14 | #include <linux/irq.h> | 15 | #include <linux/irq.h> |
| 15 | #include <linux/irqchip.h> | 16 | #include <linux/irqchip.h> |
| 16 | #include <linux/io.h> | 17 | #include <linux/io.h> |
| 17 | #include <linux/device.h> | 18 | #include <linux/device.h> |
| 18 | #include <linux/gpio.h> | 19 | #include <linux/gpio.h> |
| 20 | #include <clocksource/samsung_pwm.h> | ||
| 19 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
| 20 | #include <linux/serial_core.h> | 22 | #include <linux/serial_core.h> |
| 21 | #include <linux/of.h> | 23 | #include <linux/of.h> |
| @@ -302,6 +304,13 @@ static struct map_desc exynos5440_iodesc0[] __initdata = { | |||
| 302 | }, | 304 | }, |
| 303 | }; | 305 | }; |
| 304 | 306 | ||
| 307 | static struct samsung_pwm_variant exynos4_pwm_variant = { | ||
| 308 | .bits = 32, | ||
| 309 | .div_base = 0, | ||
| 310 | .has_tint_cstat = true, | ||
| 311 | .tclk_mask = 0, | ||
| 312 | }; | ||
| 313 | |||
| 305 | void exynos4_restart(char mode, const char *cmd) | 314 | void exynos4_restart(char mode, const char *cmd) |
| 306 | { | 315 | { |
| 307 | __raw_writel(0x1, S5P_SWRESET); | 316 | __raw_writel(0x1, S5P_SWRESET); |
| @@ -317,9 +326,16 @@ void exynos5_restart(char mode, const char *cmd) | |||
| 317 | val = 0x1; | 326 | val = 0x1; |
| 318 | addr = EXYNOS_SWRESET; | 327 | addr = EXYNOS_SWRESET; |
| 319 | } else if (of_machine_is_compatible("samsung,exynos5440")) { | 328 | } else if (of_machine_is_compatible("samsung,exynos5440")) { |
| 329 | u32 status; | ||
| 320 | np = of_find_compatible_node(NULL, NULL, "samsung,exynos5440-clock"); | 330 | np = of_find_compatible_node(NULL, NULL, "samsung,exynos5440-clock"); |
| 331 | |||
| 332 | addr = of_iomap(np, 0) + 0xbc; | ||
| 333 | status = __raw_readl(addr); | ||
| 334 | |||
| 321 | addr = of_iomap(np, 0) + 0xcc; | 335 | addr = of_iomap(np, 0) + 0xcc; |
| 322 | val = (0xfff << 20) | (0x1 << 16); | 336 | val = __raw_readl(addr); |
| 337 | |||
| 338 | val = (val & 0xffff0000) | (status & 0xffff); | ||
| 323 | } else { | 339 | } else { |
| 324 | pr_err("%s: cannot support non-DT\n", __func__); | 340 | pr_err("%s: cannot support non-DT\n", __func__); |
| 325 | return; | 341 | return; |
| @@ -442,8 +458,20 @@ static void __init exynos5440_map_io(void) | |||
| 442 | iotable_init(exynos5440_iodesc0, ARRAY_SIZE(exynos5440_iodesc0)); | 458 | iotable_init(exynos5440_iodesc0, ARRAY_SIZE(exynos5440_iodesc0)); |
| 443 | } | 459 | } |
| 444 | 460 | ||
| 461 | void __init exynos_set_timer_source(u8 channels) | ||
| 462 | { | ||
| 463 | exynos4_pwm_variant.output_mask = BIT(SAMSUNG_PWM_NUM) - 1; | ||
| 464 | exynos4_pwm_variant.output_mask &= ~channels; | ||
| 465 | } | ||
| 466 | |||
| 445 | void __init exynos_init_time(void) | 467 | void __init exynos_init_time(void) |
| 446 | { | 468 | { |
| 469 | unsigned int timer_irqs[SAMSUNG_PWM_NUM] = { | ||
| 470 | EXYNOS4_IRQ_TIMER0_VIC, EXYNOS4_IRQ_TIMER1_VIC, | ||
| 471 | EXYNOS4_IRQ_TIMER2_VIC, EXYNOS4_IRQ_TIMER3_VIC, | ||
| 472 | EXYNOS4_IRQ_TIMER4_VIC, | ||
| 473 | }; | ||
| 474 | |||
| 447 | if (of_have_populated_dt()) { | 475 | if (of_have_populated_dt()) { |
| 448 | #ifdef CONFIG_OF | 476 | #ifdef CONFIG_OF |
| 449 | of_clk_init(NULL); | 477 | of_clk_init(NULL); |
| @@ -455,7 +483,14 @@ void __init exynos_init_time(void) | |||
| 455 | exynos4_clk_init(NULL, !soc_is_exynos4210(), S5P_VA_CMU, readl(S5P_VA_CHIPID + 8) & 1); | 483 | exynos4_clk_init(NULL, !soc_is_exynos4210(), S5P_VA_CMU, readl(S5P_VA_CHIPID + 8) & 1); |
| 456 | exynos4_clk_register_fixed_ext(xxti_f, xusbxti_f); | 484 | exynos4_clk_register_fixed_ext(xxti_f, xusbxti_f); |
| 457 | #endif | 485 | #endif |
| 458 | mct_init(S5P_VA_SYSTIMER, EXYNOS4_IRQ_MCT_G0, EXYNOS4_IRQ_MCT_L0, EXYNOS4_IRQ_MCT_L1); | 486 | #ifdef CONFIG_CLKSRC_SAMSUNG_PWM |
| 487 | if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_0) | ||
| 488 | samsung_pwm_clocksource_init(S3C_VA_TIMER, | ||
| 489 | timer_irqs, &exynos4_pwm_variant); | ||
| 490 | else | ||
| 491 | #endif | ||
| 492 | mct_init(S5P_VA_SYSTIMER, EXYNOS4_IRQ_MCT_G0, | ||
| 493 | EXYNOS4_IRQ_MCT_L0, EXYNOS4_IRQ_MCT_L1); | ||
| 459 | } | 494 | } |
| 460 | } | 495 | } |
| 461 | 496 | ||
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index 60dd35cc01a6..11fc1e29819b 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h | |||
| @@ -32,6 +32,8 @@ void exynos4_clk_register_fixed_ext(unsigned long, unsigned long); | |||
| 32 | 32 | ||
| 33 | void exynos_firmware_init(void); | 33 | void exynos_firmware_init(void); |
| 34 | 34 | ||
| 35 | void exynos_set_timer_source(u8 channels); | ||
| 36 | |||
| 35 | #ifdef CONFIG_PM_GENERIC_DOMAINS | 37 | #ifdef CONFIG_PM_GENERIC_DOMAINS |
| 36 | int exynos_pm_late_initcall(void); | 38 | int exynos_pm_late_initcall(void); |
| 37 | #else | 39 | #else |
diff --git a/arch/arm/mach-exynos/include/mach/pm-core.h b/arch/arm/mach-exynos/include/mach/pm-core.h index 7dbbfec13ea5..296090e7f423 100644 --- a/arch/arm/mach-exynos/include/mach/pm-core.h +++ b/arch/arm/mach-exynos/include/mach/pm-core.h | |||
| @@ -18,8 +18,15 @@ | |||
| 18 | #ifndef __ASM_ARCH_PM_CORE_H | 18 | #ifndef __ASM_ARCH_PM_CORE_H |
| 19 | #define __ASM_ARCH_PM_CORE_H __FILE__ | 19 | #define __ASM_ARCH_PM_CORE_H __FILE__ |
| 20 | 20 | ||
| 21 | #include <linux/of.h> | ||
| 21 | #include <mach/regs-pmu.h> | 22 | #include <mach/regs-pmu.h> |
| 22 | 23 | ||
| 24 | #ifdef CONFIG_PINCTRL_EXYNOS | ||
| 25 | extern u32 exynos_get_eint_wake_mask(void); | ||
| 26 | #else | ||
| 27 | static inline u32 exynos_get_eint_wake_mask(void) { return 0xffffffff; } | ||
| 28 | #endif | ||
| 29 | |||
| 23 | static inline void s3c_pm_debug_init_uart(void) | 30 | static inline void s3c_pm_debug_init_uart(void) |
| 24 | { | 31 | { |
| 25 | /* nothing here yet */ | 32 | /* nothing here yet */ |
| @@ -27,7 +34,12 @@ static inline void s3c_pm_debug_init_uart(void) | |||
| 27 | 34 | ||
| 28 | static inline void s3c_pm_arch_prepare_irqs(void) | 35 | static inline void s3c_pm_arch_prepare_irqs(void) |
| 29 | { | 36 | { |
| 30 | __raw_writel(s3c_irqwake_eintmask, S5P_EINT_WAKEUP_MASK); | 37 | u32 eintmask = s3c_irqwake_eintmask; |
| 38 | |||
| 39 | if (of_have_populated_dt()) | ||
| 40 | eintmask = exynos_get_eint_wake_mask(); | ||
| 41 | |||
| 42 | __raw_writel(eintmask, S5P_EINT_WAKEUP_MASK); | ||
| 31 | __raw_writel(s3c_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK); | 43 | __raw_writel(s3c_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK); |
| 32 | } | 44 | } |
| 33 | 45 | ||
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c index 327d50d4681d..74ddb2b55614 100644 --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | #include <plat/mfc.h> | 41 | #include <plat/mfc.h> |
| 42 | #include <plat/sdhci.h> | 42 | #include <plat/sdhci.h> |
| 43 | #include <plat/fimc-core.h> | 43 | #include <plat/fimc-core.h> |
| 44 | #include <plat/samsung-time.h> | ||
| 45 | #include <plat/camport.h> | 44 | #include <plat/camport.h> |
| 46 | 45 | ||
| 47 | #include <mach/map.h> | 46 | #include <mach/map.h> |
| @@ -1094,7 +1093,7 @@ static void __init universal_map_io(void) | |||
| 1094 | { | 1093 | { |
| 1095 | exynos_init_io(NULL, 0); | 1094 | exynos_init_io(NULL, 0); |
| 1096 | s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs)); | 1095 | s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs)); |
| 1097 | samsung_set_timer_source(SAMSUNG_PWM2, SAMSUNG_PWM4); | 1096 | exynos_set_timer_source(BIT(2) | BIT(4)); |
| 1098 | xxti_f = 0; | 1097 | xxti_f = 0; |
| 1099 | xusbxti_f = 24000000; | 1098 | xusbxti_f = 24000000; |
| 1100 | } | 1099 | } |
| @@ -1154,7 +1153,7 @@ MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210") | |||
| 1154 | .map_io = universal_map_io, | 1153 | .map_io = universal_map_io, |
| 1155 | .init_machine = universal_machine_init, | 1154 | .init_machine = universal_machine_init, |
| 1156 | .init_late = exynos_init_late, | 1155 | .init_late = exynos_init_late, |
| 1157 | .init_time = samsung_timer_init, | 1156 | .init_time = exynos_init_time, |
| 1158 | .reserve = &universal_reserve, | 1157 | .reserve = &universal_reserve, |
| 1159 | .restart = exynos4_restart, | 1158 | .restart = exynos4_restart, |
| 1160 | MACHINE_END | 1159 | MACHINE_END |
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 30c2fe243f76..0f9c3f431a5f 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c | |||
| @@ -311,9 +311,9 @@ struct platform_device s5p_device_jpeg = { | |||
| 311 | #ifdef CONFIG_S5P_DEV_FIMD0 | 311 | #ifdef CONFIG_S5P_DEV_FIMD0 |
| 312 | static struct resource s5p_fimd0_resource[] = { | 312 | static struct resource s5p_fimd0_resource[] = { |
| 313 | [0] = DEFINE_RES_MEM(S5P_PA_FIMD0, SZ_32K), | 313 | [0] = DEFINE_RES_MEM(S5P_PA_FIMD0, SZ_32K), |
| 314 | [1] = DEFINE_RES_IRQ(IRQ_FIMD0_VSYNC), | 314 | [1] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_VSYNC, "vsync"), |
| 315 | [2] = DEFINE_RES_IRQ(IRQ_FIMD0_FIFO), | 315 | [2] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_FIFO, "fifo"), |
| 316 | [3] = DEFINE_RES_IRQ(IRQ_FIMD0_SYSTEM), | 316 | [3] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_SYSTEM, "lcd_sys"), |
| 317 | }; | 317 | }; |
| 318 | 318 | ||
| 319 | struct platform_device s5p_device_fimd0 = { | 319 | struct platform_device s5p_device_fimd0 = { |
diff --git a/arch/arm64/kernel/arm64ksyms.c b/arch/arm64/kernel/arm64ksyms.c index 7df1aad29b67..41b4f626d554 100644 --- a/arch/arm64/kernel/arm64ksyms.c +++ b/arch/arm64/kernel/arm64ksyms.c | |||
| @@ -34,6 +34,7 @@ EXPORT_SYMBOL(__strnlen_user); | |||
| 34 | EXPORT_SYMBOL(__strncpy_from_user); | 34 | EXPORT_SYMBOL(__strncpy_from_user); |
| 35 | 35 | ||
| 36 | EXPORT_SYMBOL(copy_page); | 36 | EXPORT_SYMBOL(copy_page); |
| 37 | EXPORT_SYMBOL(clear_page); | ||
| 37 | 38 | ||
| 38 | EXPORT_SYMBOL(__copy_from_user); | 39 | EXPORT_SYMBOL(__copy_from_user); |
| 39 | EXPORT_SYMBOL(__copy_to_user); | 40 | EXPORT_SYMBOL(__copy_to_user); |
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index c7e047049f2c..1d1314280a03 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S | |||
| @@ -390,6 +390,16 @@ el0_sync_compat: | |||
| 390 | b.eq el0_fpsimd_exc | 390 | b.eq el0_fpsimd_exc |
| 391 | cmp x24, #ESR_EL1_EC_UNKNOWN // unknown exception in EL0 | 391 | cmp x24, #ESR_EL1_EC_UNKNOWN // unknown exception in EL0 |
| 392 | b.eq el0_undef | 392 | b.eq el0_undef |
| 393 | cmp x24, #ESR_EL1_EC_CP15_32 // CP15 MRC/MCR trap | ||
| 394 | b.eq el0_undef | ||
| 395 | cmp x24, #ESR_EL1_EC_CP15_64 // CP15 MRRC/MCRR trap | ||
| 396 | b.eq el0_undef | ||
| 397 | cmp x24, #ESR_EL1_EC_CP14_MR // CP14 MRC/MCR trap | ||
| 398 | b.eq el0_undef | ||
| 399 | cmp x24, #ESR_EL1_EC_CP14_LS // CP14 LDC/STC trap | ||
| 400 | b.eq el0_undef | ||
| 401 | cmp x24, #ESR_EL1_EC_CP14_64 // CP14 MRRC/MCRR trap | ||
| 402 | b.eq el0_undef | ||
| 393 | cmp x24, #ESR_EL1_EC_BREAKPT_EL0 // debug exception in EL0 | 403 | cmp x24, #ESR_EL1_EC_BREAKPT_EL0 // debug exception in EL0 |
| 394 | b.ge el0_dbg | 404 | b.ge el0_dbg |
| 395 | b el0_inv | 405 | b el0_inv |
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 61d7dd29f756..f30852d28590 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c | |||
| @@ -267,7 +267,8 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs) | |||
| 267 | return; | 267 | return; |
| 268 | #endif | 268 | #endif |
| 269 | 269 | ||
| 270 | if (show_unhandled_signals) { | 270 | if (show_unhandled_signals && unhandled_signal(current, SIGILL) && |
| 271 | printk_ratelimit()) { | ||
| 271 | pr_info("%s[%d]: undefined instruction: pc=%p\n", | 272 | pr_info("%s[%d]: undefined instruction: pc=%p\n", |
| 272 | current->comm, task_pid_nr(current), pc); | 273 | current->comm, task_pid_nr(current), pc); |
| 273 | dump_instr(KERN_INFO, regs); | 274 | dump_instr(KERN_INFO, regs); |
| @@ -294,7 +295,7 @@ asmlinkage long do_ni_syscall(struct pt_regs *regs) | |||
| 294 | } | 295 | } |
| 295 | #endif | 296 | #endif |
| 296 | 297 | ||
| 297 | if (show_unhandled_signals) { | 298 | if (show_unhandled_signals && printk_ratelimit()) { |
| 298 | pr_info("%s[%d]: syscall %d\n", current->comm, | 299 | pr_info("%s[%d]: syscall %d\n", current->comm, |
| 299 | task_pid_nr(current), (int)regs->syscallno); | 300 | task_pid_nr(current), (int)regs->syscallno); |
| 300 | dump_instr("", regs); | 301 | dump_instr("", regs); |
| @@ -310,14 +311,20 @@ asmlinkage long do_ni_syscall(struct pt_regs *regs) | |||
| 310 | */ | 311 | */ |
| 311 | asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr) | 312 | asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr) |
| 312 | { | 313 | { |
| 314 | siginfo_t info; | ||
| 315 | void __user *pc = (void __user *)instruction_pointer(regs); | ||
| 313 | console_verbose(); | 316 | console_verbose(); |
| 314 | 317 | ||
| 315 | pr_crit("Bad mode in %s handler detected, code 0x%08x\n", | 318 | pr_crit("Bad mode in %s handler detected, code 0x%08x\n", |
| 316 | handler[reason], esr); | 319 | handler[reason], esr); |
| 320 | __show_regs(regs); | ||
| 321 | |||
| 322 | info.si_signo = SIGILL; | ||
| 323 | info.si_errno = 0; | ||
| 324 | info.si_code = ILL_ILLOPC; | ||
| 325 | info.si_addr = pc; | ||
| 317 | 326 | ||
| 318 | die("Oops - bad mode", regs, 0); | 327 | arm64_notify_die("Oops - bad mode", regs, &info, 0); |
| 319 | local_irq_disable(); | ||
| 320 | panic("bad mode"); | ||
| 321 | } | 328 | } |
| 322 | 329 | ||
| 323 | void __pte_error(const char *file, int line, unsigned long val) | 330 | void __pte_error(const char *file, int line, unsigned long val) |
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 98af6e760cce..1426468b77f3 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c | |||
| @@ -113,7 +113,8 @@ static void __do_user_fault(struct task_struct *tsk, unsigned long addr, | |||
| 113 | { | 113 | { |
| 114 | struct siginfo si; | 114 | struct siginfo si; |
| 115 | 115 | ||
| 116 | if (show_unhandled_signals) { | 116 | if (show_unhandled_signals && unhandled_signal(tsk, sig) && |
| 117 | printk_ratelimit()) { | ||
| 117 | pr_info("%s[%d]: unhandled %s (%d) at 0x%08lx, esr 0x%03x\n", | 118 | pr_info("%s[%d]: unhandled %s (%d) at 0x%08lx, esr 0x%03x\n", |
| 118 | tsk->comm, task_pid_nr(tsk), fault_name(esr), sig, | 119 | tsk->comm, task_pid_nr(tsk), fault_name(esr), sig, |
| 119 | addr, esr); | 120 | addr, esr); |
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index 90d3109c82f4..19325e117eea 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig | |||
| @@ -1,55 +1,78 @@ | |||
| 1 | CONFIG_EXPERIMENTAL=y | ||
| 2 | CONFIG_LOCALVERSION="-amiga" | 1 | CONFIG_LOCALVERSION="-amiga" |
| 3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
| 4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
| 4 | CONFIG_FHANDLE=y | ||
| 5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
| 6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
| 7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
| 8 | # CONFIG_UTS_NS is not set | ||
| 9 | # CONFIG_IPC_NS is not set | ||
| 10 | # CONFIG_PID_NS is not set | ||
| 11 | # CONFIG_NET_NS is not set | ||
| 8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
| 9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
| 11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
| 12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
| 13 | CONFIG_AMIGA=y | 16 | CONFIG_PARTITION_ADVANCED=y |
| 17 | CONFIG_ATARI_PARTITION=y | ||
| 18 | CONFIG_MAC_PARTITION=y | ||
| 19 | CONFIG_BSD_DISKLABEL=y | ||
| 20 | CONFIG_MINIX_SUBPARTITION=y | ||
| 21 | CONFIG_SOLARIS_X86_PARTITION=y | ||
| 22 | CONFIG_UNIXWARE_DISKLABEL=y | ||
| 23 | CONFIG_SUN_PARTITION=y | ||
| 24 | # CONFIG_EFI_PARTITION is not set | ||
| 25 | CONFIG_SYSV68_PARTITION=y | ||
| 26 | CONFIG_IOSCHED_DEADLINE=m | ||
| 14 | CONFIG_M68020=y | 27 | CONFIG_M68020=y |
| 15 | CONFIG_M68030=y | 28 | CONFIG_M68030=y |
| 16 | CONFIG_M68040=y | 29 | CONFIG_M68040=y |
| 17 | CONFIG_M68060=y | 30 | CONFIG_M68060=y |
| 18 | CONFIG_BINFMT_AOUT=m | 31 | CONFIG_AMIGA=y |
| 19 | CONFIG_BINFMT_MISC=m | ||
| 20 | CONFIG_ZORRO=y | 32 | CONFIG_ZORRO=y |
| 21 | CONFIG_AMIGA_PCMCIA=y | 33 | CONFIG_AMIGA_PCMCIA=y |
| 22 | CONFIG_HEARTBEAT=y | ||
| 23 | CONFIG_PROC_HARDWARE=y | ||
| 24 | CONFIG_ZORRO_NAMES=y | 34 | CONFIG_ZORRO_NAMES=y |
| 35 | # CONFIG_COMPACTION is not set | ||
| 36 | CONFIG_CLEANCACHE=y | ||
| 37 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 38 | CONFIG_BINFMT_AOUT=m | ||
| 39 | CONFIG_BINFMT_MISC=m | ||
| 25 | CONFIG_NET=y | 40 | CONFIG_NET=y |
| 26 | CONFIG_PACKET=y | 41 | CONFIG_PACKET=y |
| 42 | CONFIG_PACKET_DIAG=m | ||
| 27 | CONFIG_UNIX=y | 43 | CONFIG_UNIX=y |
| 44 | CONFIG_UNIX_DIAG=m | ||
| 45 | CONFIG_XFRM_MIGRATE=y | ||
| 28 | CONFIG_NET_KEY=y | 46 | CONFIG_NET_KEY=y |
| 29 | CONFIG_NET_KEY_MIGRATE=y | ||
| 30 | CONFIG_INET=y | 47 | CONFIG_INET=y |
| 31 | CONFIG_IP_PNP=y | 48 | CONFIG_IP_PNP=y |
| 49 | CONFIG_IP_PNP_DHCP=y | ||
| 50 | CONFIG_IP_PNP_BOOTP=y | ||
| 51 | CONFIG_IP_PNP_RARP=y | ||
| 32 | CONFIG_NET_IPIP=m | 52 | CONFIG_NET_IPIP=m |
| 53 | CONFIG_NET_IPGRE_DEMUX=m | ||
| 33 | CONFIG_NET_IPGRE=m | 54 | CONFIG_NET_IPGRE=m |
| 34 | CONFIG_SYN_COOKIES=y | 55 | CONFIG_SYN_COOKIES=y |
| 56 | CONFIG_NET_IPVTI=m | ||
| 35 | CONFIG_INET_AH=m | 57 | CONFIG_INET_AH=m |
| 36 | CONFIG_INET_ESP=m | 58 | CONFIG_INET_ESP=m |
| 37 | CONFIG_INET_IPCOMP=m | 59 | CONFIG_INET_IPCOMP=m |
| 38 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 60 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 39 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 61 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 40 | CONFIG_INET_XFRM_MODE_BEET=m | 62 | CONFIG_INET_XFRM_MODE_BEET=m |
| 63 | # CONFIG_INET_LRO is not set | ||
| 41 | CONFIG_INET_DIAG=m | 64 | CONFIG_INET_DIAG=m |
| 65 | CONFIG_INET_UDP_DIAG=m | ||
| 42 | CONFIG_IPV6_PRIVACY=y | 66 | CONFIG_IPV6_PRIVACY=y |
| 43 | CONFIG_IPV6_ROUTER_PREF=y | 67 | CONFIG_IPV6_ROUTER_PREF=y |
| 44 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 45 | CONFIG_INET6_AH=m | 68 | CONFIG_INET6_AH=m |
| 46 | CONFIG_INET6_ESP=m | 69 | CONFIG_INET6_ESP=m |
| 47 | CONFIG_INET6_IPCOMP=m | 70 | CONFIG_INET6_IPCOMP=m |
| 48 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 71 | CONFIG_IPV6_GRE=m |
| 49 | CONFIG_IPV6_TUNNEL=m | ||
| 50 | CONFIG_NETFILTER=y | 72 | CONFIG_NETFILTER=y |
| 51 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
| 52 | CONFIG_NF_CONNTRACK=m | 73 | CONFIG_NF_CONNTRACK=m |
| 74 | CONFIG_NF_CONNTRACK_ZONES=y | ||
| 75 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
| 53 | # CONFIG_NF_CT_PROTO_DCCP is not set | 76 | # CONFIG_NF_CT_PROTO_DCCP is not set |
| 54 | CONFIG_NF_CT_PROTO_UDPLITE=m | 77 | CONFIG_NF_CT_PROTO_UDPLITE=m |
| 55 | CONFIG_NF_CONNTRACK_AMANDA=m | 78 | CONFIG_NF_CONNTRACK_AMANDA=m |
| @@ -57,25 +80,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
| 57 | CONFIG_NF_CONNTRACK_H323=m | 80 | CONFIG_NF_CONNTRACK_H323=m |
| 58 | CONFIG_NF_CONNTRACK_IRC=m | 81 | CONFIG_NF_CONNTRACK_IRC=m |
| 59 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 82 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
| 83 | CONFIG_NF_CONNTRACK_SNMP=m | ||
| 60 | CONFIG_NF_CONNTRACK_PPTP=m | 84 | CONFIG_NF_CONNTRACK_PPTP=m |
| 61 | CONFIG_NF_CONNTRACK_SANE=m | 85 | CONFIG_NF_CONNTRACK_SANE=m |
| 62 | CONFIG_NF_CONNTRACK_SIP=m | 86 | CONFIG_NF_CONNTRACK_SIP=m |
| 63 | CONFIG_NF_CONNTRACK_TFTP=m | 87 | CONFIG_NF_CONNTRACK_TFTP=m |
| 88 | CONFIG_NETFILTER_XT_SET=m | ||
| 89 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
| 64 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 90 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 65 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 91 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 66 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 92 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 93 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
| 94 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
| 95 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
| 67 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 96 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 68 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 97 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 69 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 98 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 99 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
| 100 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
| 70 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 101 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 71 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 102 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 72 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 103 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 104 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
| 105 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
| 73 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 106 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
| 74 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 107 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 75 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 108 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 109 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
| 76 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 110 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| 77 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 111 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 78 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 112 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 113 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
| 79 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 114 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 80 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 115 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 81 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 116 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| @@ -86,6 +121,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
| 86 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 121 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 87 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 122 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 88 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 123 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
| 124 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
| 125 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
| 89 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 126 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 90 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 127 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 91 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 128 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| @@ -99,22 +136,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 99 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 136 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 100 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 137 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 101 | CONFIG_NETFILTER_XT_MATCH_U32=m | 138 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 139 | CONFIG_IP_SET=m | ||
| 140 | CONFIG_IP_SET_BITMAP_IP=m | ||
| 141 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
| 142 | CONFIG_IP_SET_BITMAP_PORT=m | ||
| 143 | CONFIG_IP_SET_HASH_IP=m | ||
| 144 | CONFIG_IP_SET_HASH_IPPORT=m | ||
| 145 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
| 146 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
| 147 | CONFIG_IP_SET_HASH_NET=m | ||
| 148 | CONFIG_IP_SET_HASH_NETPORT=m | ||
| 149 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
| 150 | CONFIG_IP_SET_LIST_SET=m | ||
| 102 | CONFIG_NF_CONNTRACK_IPV4=m | 151 | CONFIG_NF_CONNTRACK_IPV4=m |
| 103 | CONFIG_IP_NF_QUEUE=m | ||
| 104 | CONFIG_IP_NF_IPTABLES=m | 152 | CONFIG_IP_NF_IPTABLES=m |
| 105 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 106 | CONFIG_IP_NF_MATCH_AH=m | 153 | CONFIG_IP_NF_MATCH_AH=m |
| 107 | CONFIG_IP_NF_MATCH_ECN=m | 154 | CONFIG_IP_NF_MATCH_ECN=m |
| 155 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
| 108 | CONFIG_IP_NF_MATCH_TTL=m | 156 | CONFIG_IP_NF_MATCH_TTL=m |
| 109 | CONFIG_IP_NF_FILTER=m | 157 | CONFIG_IP_NF_FILTER=m |
| 110 | CONFIG_IP_NF_TARGET_REJECT=m | 158 | CONFIG_IP_NF_TARGET_REJECT=m |
| 111 | CONFIG_IP_NF_TARGET_LOG=m | ||
| 112 | CONFIG_IP_NF_TARGET_ULOG=m | 159 | CONFIG_IP_NF_TARGET_ULOG=m |
| 113 | CONFIG_NF_NAT=m | 160 | CONFIG_NF_NAT_IPV4=m |
| 114 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 161 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 115 | CONFIG_IP_NF_TARGET_NETMAP=m | 162 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 116 | CONFIG_IP_NF_TARGET_REDIRECT=m | 163 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 117 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
| 118 | CONFIG_IP_NF_MANGLE=m | 164 | CONFIG_IP_NF_MANGLE=m |
| 119 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 165 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
| 120 | CONFIG_IP_NF_TARGET_ECN=m | 166 | CONFIG_IP_NF_TARGET_ECN=m |
| @@ -124,7 +170,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
| 124 | CONFIG_IP_NF_ARPFILTER=m | 170 | CONFIG_IP_NF_ARPFILTER=m |
| 125 | CONFIG_IP_NF_ARP_MANGLE=m | 171 | CONFIG_IP_NF_ARP_MANGLE=m |
| 126 | CONFIG_NF_CONNTRACK_IPV6=m | 172 | CONFIG_NF_CONNTRACK_IPV6=m |
| 127 | CONFIG_IP6_NF_QUEUE=m | ||
| 128 | CONFIG_IP6_NF_IPTABLES=m | 173 | CONFIG_IP6_NF_IPTABLES=m |
| 129 | CONFIG_IP6_NF_MATCH_AH=m | 174 | CONFIG_IP6_NF_MATCH_AH=m |
| 130 | CONFIG_IP6_NF_MATCH_EUI64=m | 175 | CONFIG_IP6_NF_MATCH_EUI64=m |
| @@ -133,18 +178,30 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
| 133 | CONFIG_IP6_NF_MATCH_HL=m | 178 | CONFIG_IP6_NF_MATCH_HL=m |
| 134 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 179 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 135 | CONFIG_IP6_NF_MATCH_MH=m | 180 | CONFIG_IP6_NF_MATCH_MH=m |
| 181 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
| 136 | CONFIG_IP6_NF_MATCH_RT=m | 182 | CONFIG_IP6_NF_MATCH_RT=m |
| 137 | CONFIG_IP6_NF_TARGET_HL=m | 183 | CONFIG_IP6_NF_TARGET_HL=m |
| 138 | CONFIG_IP6_NF_TARGET_LOG=m | ||
| 139 | CONFIG_IP6_NF_FILTER=m | 184 | CONFIG_IP6_NF_FILTER=m |
| 140 | CONFIG_IP6_NF_TARGET_REJECT=m | 185 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 141 | CONFIG_IP6_NF_MANGLE=m | 186 | CONFIG_IP6_NF_MANGLE=m |
| 142 | CONFIG_IP6_NF_RAW=m | 187 | CONFIG_IP6_NF_RAW=m |
| 188 | CONFIG_NF_NAT_IPV6=m | ||
| 189 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
| 190 | CONFIG_IP6_NF_TARGET_NPT=m | ||
| 143 | CONFIG_IP_DCCP=m | 191 | CONFIG_IP_DCCP=m |
| 144 | # CONFIG_IP_DCCP_CCID3 is not set | 192 | # CONFIG_IP_DCCP_CCID3 is not set |
| 193 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
| 194 | CONFIG_RDS=m | ||
| 195 | CONFIG_RDS_TCP=m | ||
| 196 | CONFIG_L2TP=m | ||
| 145 | CONFIG_ATALK=m | 197 | CONFIG_ATALK=m |
| 198 | CONFIG_BATMAN_ADV=m | ||
| 199 | CONFIG_BATMAN_ADV_DAT=y | ||
| 200 | # CONFIG_WIRELESS is not set | ||
| 146 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 201 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 202 | CONFIG_DEVTMPFS=y | ||
| 147 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 203 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
| 204 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
| 148 | CONFIG_CONNECTOR=m | 205 | CONFIG_CONNECTOR=m |
| 149 | CONFIG_PARPORT=m | 206 | CONFIG_PARPORT=m |
| 150 | CONFIG_PARPORT_AMIGA=m | 207 | CONFIG_PARPORT_AMIGA=m |
| @@ -154,11 +211,13 @@ CONFIG_AMIGA_FLOPPY=y | |||
| 154 | CONFIG_AMIGA_Z2RAM=y | 211 | CONFIG_AMIGA_Z2RAM=y |
| 155 | CONFIG_BLK_DEV_LOOP=y | 212 | CONFIG_BLK_DEV_LOOP=y |
| 156 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 213 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
| 214 | CONFIG_BLK_DEV_DRBD=m | ||
| 157 | CONFIG_BLK_DEV_NBD=m | 215 | CONFIG_BLK_DEV_NBD=m |
| 158 | CONFIG_BLK_DEV_RAM=y | 216 | CONFIG_BLK_DEV_RAM=y |
| 159 | CONFIG_CDROM_PKTCDVD=m | 217 | CONFIG_CDROM_PKTCDVD=m |
| 160 | CONFIG_ATA_OVER_ETH=m | 218 | CONFIG_ATA_OVER_ETH=m |
| 161 | CONFIG_IDE=y | 219 | CONFIG_IDE=y |
| 220 | CONFIG_IDE_GD_ATAPI=y | ||
| 162 | CONFIG_BLK_DEV_IDECD=y | 221 | CONFIG_BLK_DEV_IDECD=y |
| 163 | CONFIG_BLK_DEV_GAYLE=y | 222 | CONFIG_BLK_DEV_GAYLE=y |
| 164 | CONFIG_BLK_DEV_BUDDHA=y | 223 | CONFIG_BLK_DEV_BUDDHA=y |
| @@ -172,57 +231,77 @@ CONFIG_BLK_DEV_SR=y | |||
| 172 | CONFIG_BLK_DEV_SR_VENDOR=y | 231 | CONFIG_BLK_DEV_SR_VENDOR=y |
| 173 | CONFIG_CHR_DEV_SG=m | 232 | CONFIG_CHR_DEV_SG=m |
| 174 | CONFIG_SCSI_CONSTANTS=y | 233 | CONFIG_SCSI_CONSTANTS=y |
| 175 | CONFIG_SCSI_SAS_LIBSAS=m | 234 | CONFIG_SCSI_SAS_ATTRS=m |
| 176 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
| 177 | CONFIG_SCSI_SRP_ATTRS=m | ||
| 178 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
| 179 | CONFIG_ISCSI_TCP=m | 235 | CONFIG_ISCSI_TCP=m |
| 236 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
| 180 | CONFIG_A3000_SCSI=y | 237 | CONFIG_A3000_SCSI=y |
| 181 | CONFIG_A2091_SCSI=y | 238 | CONFIG_A2091_SCSI=y |
| 182 | CONFIG_GVP11_SCSI=y | 239 | CONFIG_GVP11_SCSI=y |
| 183 | CONFIG_SCSI_A4000T=y | 240 | CONFIG_SCSI_A4000T=y |
| 184 | CONFIG_SCSI_ZORRO7XX=y | 241 | CONFIG_SCSI_ZORRO7XX=y |
| 185 | CONFIG_MD=y | 242 | CONFIG_MD=y |
| 186 | CONFIG_BLK_DEV_MD=m | ||
| 187 | CONFIG_MD_LINEAR=m | 243 | CONFIG_MD_LINEAR=m |
| 188 | CONFIG_MD_RAID0=m | 244 | CONFIG_MD_RAID0=m |
| 189 | CONFIG_MD_RAID1=m | ||
| 190 | CONFIG_MD_RAID456=m | ||
| 191 | CONFIG_BLK_DEV_DM=m | 245 | CONFIG_BLK_DEV_DM=m |
| 192 | CONFIG_DM_CRYPT=m | 246 | CONFIG_DM_CRYPT=m |
| 193 | CONFIG_DM_SNAPSHOT=m | 247 | CONFIG_DM_SNAPSHOT=m |
| 248 | CONFIG_DM_THIN_PROVISIONING=m | ||
| 249 | CONFIG_DM_CACHE=m | ||
| 194 | CONFIG_DM_MIRROR=m | 250 | CONFIG_DM_MIRROR=m |
| 251 | CONFIG_DM_RAID=m | ||
| 195 | CONFIG_DM_ZERO=m | 252 | CONFIG_DM_ZERO=m |
| 196 | CONFIG_DM_MULTIPATH=m | 253 | CONFIG_DM_MULTIPATH=m |
| 197 | CONFIG_DM_UEVENT=y | 254 | CONFIG_DM_UEVENT=y |
| 255 | CONFIG_TARGET_CORE=m | ||
| 256 | CONFIG_TCM_IBLOCK=m | ||
| 257 | CONFIG_TCM_FILEIO=m | ||
| 258 | CONFIG_TCM_PSCSI=m | ||
| 198 | CONFIG_NETDEVICES=y | 259 | CONFIG_NETDEVICES=y |
| 199 | CONFIG_DUMMY=m | 260 | CONFIG_DUMMY=m |
| 200 | CONFIG_MACVLAN=m | ||
| 201 | CONFIG_EQUALIZER=m | 261 | CONFIG_EQUALIZER=m |
| 262 | CONFIG_NET_TEAM=m | ||
| 263 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
| 264 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
| 265 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
| 266 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
| 267 | CONFIG_VXLAN=m | ||
| 268 | CONFIG_NETCONSOLE=m | ||
| 269 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
| 202 | CONFIG_VETH=m | 270 | CONFIG_VETH=m |
| 203 | CONFIG_NET_ETHERNET=y | 271 | # CONFIG_NET_VENDOR_3COM is not set |
| 204 | CONFIG_ARIADNE=y | ||
| 205 | CONFIG_A2065=y | 272 | CONFIG_A2065=y |
| 273 | CONFIG_ARIADNE=y | ||
| 274 | # CONFIG_NET_CADENCE is not set | ||
| 275 | # CONFIG_NET_VENDOR_BROADCOM is not set | ||
| 276 | # CONFIG_NET_VENDOR_CIRRUS is not set | ||
| 277 | # CONFIG_NET_VENDOR_FUJITSU is not set | ||
| 278 | # CONFIG_NET_VENDOR_HP is not set | ||
| 279 | # CONFIG_NET_VENDOR_INTEL is not set | ||
| 280 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
| 281 | # CONFIG_NET_VENDOR_MICREL is not set | ||
| 206 | CONFIG_HYDRA=y | 282 | CONFIG_HYDRA=y |
| 207 | CONFIG_ZORRO8390=y | ||
| 208 | CONFIG_APNE=y | 283 | CONFIG_APNE=y |
| 209 | # CONFIG_NETDEV_1000 is not set | 284 | CONFIG_ZORRO8390=y |
| 210 | # CONFIG_NETDEV_10000 is not set | 285 | # CONFIG_NET_VENDOR_SEEQ is not set |
| 286 | # CONFIG_NET_VENDOR_SMSC is not set | ||
| 287 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
| 288 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
| 211 | CONFIG_PPP=m | 289 | CONFIG_PPP=m |
| 212 | CONFIG_PPP_FILTER=y | ||
| 213 | CONFIG_PPP_ASYNC=m | ||
| 214 | CONFIG_PPP_SYNC_TTY=m | ||
| 215 | CONFIG_PPP_DEFLATE=m | ||
| 216 | CONFIG_PPP_BSDCOMP=m | 290 | CONFIG_PPP_BSDCOMP=m |
| 291 | CONFIG_PPP_DEFLATE=m | ||
| 292 | CONFIG_PPP_FILTER=y | ||
| 217 | CONFIG_PPP_MPPE=m | 293 | CONFIG_PPP_MPPE=m |
| 218 | CONFIG_PPPOE=m | 294 | CONFIG_PPPOE=m |
| 295 | CONFIG_PPTP=m | ||
| 296 | CONFIG_PPPOL2TP=m | ||
| 297 | CONFIG_PPP_ASYNC=m | ||
| 298 | CONFIG_PPP_SYNC_TTY=m | ||
| 219 | CONFIG_SLIP=m | 299 | CONFIG_SLIP=m |
| 220 | CONFIG_SLIP_COMPRESSED=y | 300 | CONFIG_SLIP_COMPRESSED=y |
| 221 | CONFIG_SLIP_SMART=y | 301 | CONFIG_SLIP_SMART=y |
| 222 | CONFIG_SLIP_MODE_SLIP6=y | 302 | CONFIG_SLIP_MODE_SLIP6=y |
| 223 | CONFIG_NETCONSOLE=m | 303 | # CONFIG_WLAN is not set |
| 224 | CONFIG_NETCONSOLE_DYNAMIC=y | 304 | CONFIG_INPUT_EVDEV=m |
| 225 | CONFIG_INPUT_FF_MEMLESS=m | ||
| 226 | CONFIG_KEYBOARD_AMIGA=y | 305 | CONFIG_KEYBOARD_AMIGA=y |
| 227 | # CONFIG_KEYBOARD_ATKBD is not set | 306 | # CONFIG_KEYBOARD_ATKBD is not set |
| 228 | # CONFIG_MOUSE_PS2 is not set | 307 | # CONFIG_MOUSE_PS2 is not set |
| @@ -233,11 +312,14 @@ CONFIG_INPUT_MISC=y | |||
| 233 | CONFIG_INPUT_M68K_BEEP=m | 312 | CONFIG_INPUT_M68K_BEEP=m |
| 234 | # CONFIG_SERIO is not set | 313 | # CONFIG_SERIO is not set |
| 235 | CONFIG_VT_HW_CONSOLE_BINDING=y | 314 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 315 | # CONFIG_LEGACY_PTYS is not set | ||
| 236 | # CONFIG_DEVKMEM is not set | 316 | # CONFIG_DEVKMEM is not set |
| 237 | CONFIG_PRINTER=m | 317 | CONFIG_PRINTER=m |
| 238 | # CONFIG_HW_RANDOM is not set | 318 | # CONFIG_HW_RANDOM is not set |
| 239 | CONFIG_GEN_RTC=m | 319 | CONFIG_NTP_PPS=y |
| 240 | CONFIG_GEN_RTC_X=y | 320 | CONFIG_PPS_CLIENT_LDISC=m |
| 321 | CONFIG_PPS_CLIENT_PARPORT=m | ||
| 322 | CONFIG_PTP_1588_CLOCK=m | ||
| 241 | # CONFIG_HWMON is not set | 323 | # CONFIG_HWMON is not set |
| 242 | CONFIG_FB=y | 324 | CONFIG_FB=y |
| 243 | CONFIG_FB_CIRRUS=y | 325 | CONFIG_FB_CIRRUS=y |
| @@ -252,48 +334,64 @@ CONFIG_SOUND=m | |||
| 252 | CONFIG_DMASOUND_PAULA=m | 334 | CONFIG_DMASOUND_PAULA=m |
| 253 | CONFIG_HID=m | 335 | CONFIG_HID=m |
| 254 | CONFIG_HIDRAW=y | 336 | CONFIG_HIDRAW=y |
| 337 | CONFIG_UHID=m | ||
| 338 | # CONFIG_HID_GENERIC is not set | ||
| 255 | # CONFIG_USB_SUPPORT is not set | 339 | # CONFIG_USB_SUPPORT is not set |
| 340 | CONFIG_RTC_CLASS=y | ||
| 341 | CONFIG_RTC_DRV_MSM6242=m | ||
| 342 | CONFIG_RTC_DRV_RP5C01=m | ||
| 343 | # CONFIG_IOMMU_SUPPORT is not set | ||
| 344 | CONFIG_HEARTBEAT=y | ||
| 345 | CONFIG_PROC_HARDWARE=y | ||
| 256 | CONFIG_AMIGA_BUILTIN_SERIAL=y | 346 | CONFIG_AMIGA_BUILTIN_SERIAL=y |
| 257 | CONFIG_SERIAL_CONSOLE=y | 347 | CONFIG_SERIAL_CONSOLE=y |
| 258 | CONFIG_EXT2_FS=y | 348 | CONFIG_EXT2_FS=y |
| 259 | CONFIG_EXT3_FS=y | 349 | CONFIG_EXT3_FS=y |
| 260 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 350 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
| 261 | # CONFIG_EXT3_FS_XATTR is not set | 351 | # CONFIG_EXT3_FS_XATTR is not set |
| 352 | CONFIG_EXT4_FS=y | ||
| 262 | CONFIG_REISERFS_FS=m | 353 | CONFIG_REISERFS_FS=m |
| 263 | CONFIG_JFS_FS=m | 354 | CONFIG_JFS_FS=m |
| 264 | CONFIG_XFS_FS=m | 355 | CONFIG_XFS_FS=m |
| 265 | CONFIG_OCFS2_FS=m | 356 | CONFIG_OCFS2_FS=m |
| 266 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 267 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 357 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 358 | CONFIG_FANOTIFY=y | ||
| 268 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 359 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 269 | # CONFIG_PRINT_QUOTA_WARNING is not set | 360 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 270 | CONFIG_AUTOFS_FS=m | ||
| 271 | CONFIG_AUTOFS4_FS=m | 361 | CONFIG_AUTOFS4_FS=m |
| 272 | CONFIG_FUSE_FS=m | 362 | CONFIG_FUSE_FS=m |
| 363 | CONFIG_CUSE=m | ||
| 273 | CONFIG_ISO9660_FS=y | 364 | CONFIG_ISO9660_FS=y |
| 274 | CONFIG_JOLIET=y | 365 | CONFIG_JOLIET=y |
| 275 | CONFIG_ZISOFS=y | 366 | CONFIG_ZISOFS=y |
| 276 | CONFIG_UDF_FS=m | 367 | CONFIG_UDF_FS=m |
| 277 | CONFIG_MSDOS_FS=y | 368 | CONFIG_MSDOS_FS=m |
| 278 | CONFIG_VFAT_FS=m | 369 | CONFIG_VFAT_FS=m |
| 279 | CONFIG_PROC_KCORE=y | 370 | CONFIG_PROC_KCORE=y |
| 280 | CONFIG_TMPFS=y | 371 | CONFIG_TMPFS=y |
| 281 | CONFIG_AFFS_FS=m | 372 | CONFIG_AFFS_FS=m |
| 373 | CONFIG_ECRYPT_FS=m | ||
| 374 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
| 282 | CONFIG_HFS_FS=m | 375 | CONFIG_HFS_FS=m |
| 283 | CONFIG_HFSPLUS_FS=m | 376 | CONFIG_HFSPLUS_FS=m |
| 284 | CONFIG_CRAMFS=m | 377 | CONFIG_CRAMFS=m |
| 285 | CONFIG_SQUASHFS=m | 378 | CONFIG_SQUASHFS=m |
| 286 | CONFIG_MINIX_FS=y | 379 | CONFIG_SQUASHFS_LZO=y |
| 380 | CONFIG_MINIX_FS=m | ||
| 381 | CONFIG_OMFS_FS=m | ||
| 287 | CONFIG_HPFS_FS=m | 382 | CONFIG_HPFS_FS=m |
| 383 | CONFIG_QNX4FS_FS=m | ||
| 384 | CONFIG_QNX6FS_FS=m | ||
| 288 | CONFIG_SYSV_FS=m | 385 | CONFIG_SYSV_FS=m |
| 289 | CONFIG_UFS_FS=m | 386 | CONFIG_UFS_FS=m |
| 290 | CONFIG_NFS_FS=y | 387 | CONFIG_NFS_FS=y |
| 291 | CONFIG_NFS_V3=y | ||
| 292 | CONFIG_NFS_V4=y | 388 | CONFIG_NFS_V4=y |
| 389 | CONFIG_NFS_SWAP=y | ||
| 390 | CONFIG_ROOT_NFS=y | ||
| 293 | CONFIG_NFSD=m | 391 | CONFIG_NFSD=m |
| 294 | CONFIG_NFSD_V3=y | 392 | CONFIG_NFSD_V3=y |
| 295 | CONFIG_SMB_FS=m | 393 | CONFIG_CIFS=m |
| 296 | CONFIG_SMB_NLS_DEFAULT=y | 394 | # CONFIG_CIFS_DEBUG is not set |
| 297 | CONFIG_CODA_FS=m | 395 | CONFIG_CODA_FS=m |
| 298 | CONFIG_NLS_CODEPAGE_437=y | 396 | CONFIG_NLS_CODEPAGE_437=y |
| 299 | CONFIG_NLS_CODEPAGE_737=m | 397 | CONFIG_NLS_CODEPAGE_737=m |
| @@ -332,10 +430,23 @@ CONFIG_NLS_ISO8859_14=m | |||
| 332 | CONFIG_NLS_ISO8859_15=m | 430 | CONFIG_NLS_ISO8859_15=m |
| 333 | CONFIG_NLS_KOI8_R=m | 431 | CONFIG_NLS_KOI8_R=m |
| 334 | CONFIG_NLS_KOI8_U=m | 432 | CONFIG_NLS_KOI8_U=m |
| 433 | CONFIG_NLS_MAC_ROMAN=m | ||
| 434 | CONFIG_NLS_MAC_CELTIC=m | ||
| 435 | CONFIG_NLS_MAC_CENTEURO=m | ||
| 436 | CONFIG_NLS_MAC_CROATIAN=m | ||
| 437 | CONFIG_NLS_MAC_CYRILLIC=m | ||
| 438 | CONFIG_NLS_MAC_GAELIC=m | ||
| 439 | CONFIG_NLS_MAC_GREEK=m | ||
| 440 | CONFIG_NLS_MAC_ICELAND=m | ||
| 441 | CONFIG_NLS_MAC_INUIT=m | ||
| 442 | CONFIG_NLS_MAC_ROMANIAN=m | ||
| 443 | CONFIG_NLS_MAC_TURKISH=m | ||
| 335 | CONFIG_DLM=m | 444 | CONFIG_DLM=m |
| 336 | CONFIG_MAGIC_SYSRQ=y | 445 | CONFIG_MAGIC_SYSRQ=y |
| 337 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 446 | CONFIG_ASYNC_RAID6_TEST=m |
| 338 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 447 | CONFIG_ENCRYPTED_KEYS=m |
| 448 | CONFIG_CRYPTO_MANAGER=y | ||
| 449 | CONFIG_CRYPTO_USER=m | ||
| 339 | CONFIG_CRYPTO_NULL=m | 450 | CONFIG_CRYPTO_NULL=m |
| 340 | CONFIG_CRYPTO_CRYPTD=m | 451 | CONFIG_CRYPTO_CRYPTD=m |
| 341 | CONFIG_CRYPTO_TEST=m | 452 | CONFIG_CRYPTO_TEST=m |
| @@ -345,19 +456,16 @@ CONFIG_CRYPTO_CTS=m | |||
| 345 | CONFIG_CRYPTO_LRW=m | 456 | CONFIG_CRYPTO_LRW=m |
| 346 | CONFIG_CRYPTO_PCBC=m | 457 | CONFIG_CRYPTO_PCBC=m |
| 347 | CONFIG_CRYPTO_XTS=m | 458 | CONFIG_CRYPTO_XTS=m |
| 348 | CONFIG_CRYPTO_HMAC=y | ||
| 349 | CONFIG_CRYPTO_XCBC=m | 459 | CONFIG_CRYPTO_XCBC=m |
| 350 | CONFIG_CRYPTO_MD4=m | 460 | CONFIG_CRYPTO_VMAC=m |
| 351 | CONFIG_CRYPTO_MICHAEL_MIC=m | 461 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 352 | CONFIG_CRYPTO_RMD128=m | 462 | CONFIG_CRYPTO_RMD128=m |
| 353 | CONFIG_CRYPTO_RMD160=m | 463 | CONFIG_CRYPTO_RMD160=m |
| 354 | CONFIG_CRYPTO_RMD256=m | 464 | CONFIG_CRYPTO_RMD256=m |
| 355 | CONFIG_CRYPTO_RMD320=m | 465 | CONFIG_CRYPTO_RMD320=m |
| 356 | CONFIG_CRYPTO_SHA256=m | ||
| 357 | CONFIG_CRYPTO_SHA512=m | 466 | CONFIG_CRYPTO_SHA512=m |
| 358 | CONFIG_CRYPTO_TGR192=m | 467 | CONFIG_CRYPTO_TGR192=m |
| 359 | CONFIG_CRYPTO_WP512=m | 468 | CONFIG_CRYPTO_WP512=m |
| 360 | CONFIG_CRYPTO_AES=m | ||
| 361 | CONFIG_CRYPTO_ANUBIS=m | 469 | CONFIG_CRYPTO_ANUBIS=m |
| 362 | CONFIG_CRYPTO_BLOWFISH=m | 470 | CONFIG_CRYPTO_BLOWFISH=m |
| 363 | CONFIG_CRYPTO_CAMELLIA=m | 471 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -373,6 +481,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
| 373 | CONFIG_CRYPTO_ZLIB=m | 481 | CONFIG_CRYPTO_ZLIB=m |
| 374 | CONFIG_CRYPTO_LZO=m | 482 | CONFIG_CRYPTO_LZO=m |
| 375 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 483 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 484 | CONFIG_CRYPTO_USER_API_HASH=m | ||
| 485 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
| 376 | # CONFIG_CRYPTO_HW is not set | 486 | # CONFIG_CRYPTO_HW is not set |
| 377 | CONFIG_CRC16=m | ||
| 378 | CONFIG_CRC_T10DIF=y | 487 | CONFIG_CRC_T10DIF=y |
| 488 | CONFIG_XZ_DEC_X86=y | ||
| 489 | CONFIG_XZ_DEC_POWERPC=y | ||
| 490 | CONFIG_XZ_DEC_IA64=y | ||
| 491 | CONFIG_XZ_DEC_ARM=y | ||
| 492 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
| 493 | CONFIG_XZ_DEC_SPARC=y | ||
| 494 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index 8f4f657fdbc6..14dc6ccda7f4 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig | |||
| @@ -1,55 +1,76 @@ | |||
| 1 | CONFIG_EXPERIMENTAL=y | ||
| 2 | CONFIG_LOCALVERSION="-apollo" | 1 | CONFIG_LOCALVERSION="-apollo" |
| 3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
| 4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
| 4 | CONFIG_FHANDLE=y | ||
| 5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
| 6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
| 7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
| 8 | # CONFIG_UTS_NS is not set | ||
| 9 | # CONFIG_IPC_NS is not set | ||
| 10 | # CONFIG_PID_NS is not set | ||
| 11 | # CONFIG_NET_NS is not set | ||
| 8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
| 9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
| 11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
| 12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
| 13 | CONFIG_APOLLO=y | 16 | CONFIG_PARTITION_ADVANCED=y |
| 17 | CONFIG_AMIGA_PARTITION=y | ||
| 18 | CONFIG_ATARI_PARTITION=y | ||
| 19 | CONFIG_MAC_PARTITION=y | ||
| 20 | CONFIG_BSD_DISKLABEL=y | ||
| 21 | CONFIG_MINIX_SUBPARTITION=y | ||
| 22 | CONFIG_SOLARIS_X86_PARTITION=y | ||
| 23 | CONFIG_UNIXWARE_DISKLABEL=y | ||
| 24 | CONFIG_SUN_PARTITION=y | ||
| 25 | # CONFIG_EFI_PARTITION is not set | ||
| 26 | CONFIG_SYSV68_PARTITION=y | ||
| 27 | CONFIG_IOSCHED_DEADLINE=m | ||
| 14 | CONFIG_M68020=y | 28 | CONFIG_M68020=y |
| 15 | CONFIG_M68030=y | 29 | CONFIG_M68030=y |
| 16 | CONFIG_M68040=y | 30 | CONFIG_M68040=y |
| 17 | CONFIG_M68060=y | 31 | CONFIG_M68060=y |
| 32 | CONFIG_APOLLO=y | ||
| 33 | # CONFIG_COMPACTION is not set | ||
| 34 | CONFIG_CLEANCACHE=y | ||
| 35 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 18 | CONFIG_BINFMT_AOUT=m | 36 | CONFIG_BINFMT_AOUT=m |
| 19 | CONFIG_BINFMT_MISC=m | 37 | CONFIG_BINFMT_MISC=m |
| 20 | CONFIG_HEARTBEAT=y | ||
| 21 | CONFIG_PROC_HARDWARE=y | ||
| 22 | CONFIG_NET=y | 38 | CONFIG_NET=y |
| 23 | CONFIG_PACKET=y | 39 | CONFIG_PACKET=y |
| 40 | CONFIG_PACKET_DIAG=m | ||
| 24 | CONFIG_UNIX=y | 41 | CONFIG_UNIX=y |
| 42 | CONFIG_UNIX_DIAG=m | ||
| 43 | CONFIG_XFRM_MIGRATE=y | ||
| 25 | CONFIG_NET_KEY=y | 44 | CONFIG_NET_KEY=y |
| 26 | CONFIG_NET_KEY_MIGRATE=y | ||
| 27 | CONFIG_INET=y | 45 | CONFIG_INET=y |
| 28 | CONFIG_IP_PNP=y | 46 | CONFIG_IP_PNP=y |
| 29 | CONFIG_IP_PNP_DHCP=y | 47 | CONFIG_IP_PNP_DHCP=y |
| 30 | CONFIG_IP_PNP_BOOTP=y | 48 | CONFIG_IP_PNP_BOOTP=y |
| 31 | CONFIG_IP_PNP_RARP=y | 49 | CONFIG_IP_PNP_RARP=y |
| 32 | CONFIG_NET_IPIP=m | 50 | CONFIG_NET_IPIP=m |
| 51 | CONFIG_NET_IPGRE_DEMUX=m | ||
| 33 | CONFIG_NET_IPGRE=m | 52 | CONFIG_NET_IPGRE=m |
| 34 | CONFIG_SYN_COOKIES=y | 53 | CONFIG_SYN_COOKIES=y |
| 54 | CONFIG_NET_IPVTI=m | ||
| 35 | CONFIG_INET_AH=m | 55 | CONFIG_INET_AH=m |
| 36 | CONFIG_INET_ESP=m | 56 | CONFIG_INET_ESP=m |
| 37 | CONFIG_INET_IPCOMP=m | 57 | CONFIG_INET_IPCOMP=m |
| 38 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 58 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 39 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 59 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 40 | CONFIG_INET_XFRM_MODE_BEET=m | 60 | CONFIG_INET_XFRM_MODE_BEET=m |
| 61 | # CONFIG_INET_LRO is not set | ||
| 41 | CONFIG_INET_DIAG=m | 62 | CONFIG_INET_DIAG=m |
| 63 | CONFIG_INET_UDP_DIAG=m | ||
| 42 | CONFIG_IPV6_PRIVACY=y | 64 | CONFIG_IPV6_PRIVACY=y |
| 43 | CONFIG_IPV6_ROUTER_PREF=y | 65 | CONFIG_IPV6_ROUTER_PREF=y |
| 44 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 45 | CONFIG_INET6_AH=m | 66 | CONFIG_INET6_AH=m |
| 46 | CONFIG_INET6_ESP=m | 67 | CONFIG_INET6_ESP=m |
| 47 | CONFIG_INET6_IPCOMP=m | 68 | CONFIG_INET6_IPCOMP=m |
| 48 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 69 | CONFIG_IPV6_GRE=m |
| 49 | CONFIG_IPV6_TUNNEL=m | ||
| 50 | CONFIG_NETFILTER=y | 70 | CONFIG_NETFILTER=y |
| 51 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
| 52 | CONFIG_NF_CONNTRACK=m | 71 | CONFIG_NF_CONNTRACK=m |
| 72 | CONFIG_NF_CONNTRACK_ZONES=y | ||
| 73 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
| 53 | # CONFIG_NF_CT_PROTO_DCCP is not set | 74 | # CONFIG_NF_CT_PROTO_DCCP is not set |
| 54 | CONFIG_NF_CT_PROTO_UDPLITE=m | 75 | CONFIG_NF_CT_PROTO_UDPLITE=m |
| 55 | CONFIG_NF_CONNTRACK_AMANDA=m | 76 | CONFIG_NF_CONNTRACK_AMANDA=m |
| @@ -57,25 +78,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
| 57 | CONFIG_NF_CONNTRACK_H323=m | 78 | CONFIG_NF_CONNTRACK_H323=m |
| 58 | CONFIG_NF_CONNTRACK_IRC=m | 79 | CONFIG_NF_CONNTRACK_IRC=m |
| 59 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 80 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
| 81 | CONFIG_NF_CONNTRACK_SNMP=m | ||
| 60 | CONFIG_NF_CONNTRACK_PPTP=m | 82 | CONFIG_NF_CONNTRACK_PPTP=m |
| 61 | CONFIG_NF_CONNTRACK_SANE=m | 83 | CONFIG_NF_CONNTRACK_SANE=m |
| 62 | CONFIG_NF_CONNTRACK_SIP=m | 84 | CONFIG_NF_CONNTRACK_SIP=m |
| 63 | CONFIG_NF_CONNTRACK_TFTP=m | 85 | CONFIG_NF_CONNTRACK_TFTP=m |
| 86 | CONFIG_NETFILTER_XT_SET=m | ||
| 87 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
| 64 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 88 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 65 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 89 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 66 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 90 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 91 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
| 92 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
| 93 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
| 67 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 94 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 68 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 95 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 69 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 96 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 97 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
| 98 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
| 70 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 99 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 71 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 100 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 72 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 101 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 102 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
| 103 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
| 73 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 104 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
| 74 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 105 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 75 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 106 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 107 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
| 76 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 108 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| 77 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 109 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 78 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 110 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 111 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
| 79 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 112 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 80 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 113 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 81 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 114 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| @@ -86,6 +119,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
| 86 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 119 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 87 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 120 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 88 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 121 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
| 122 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
| 123 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
| 89 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 124 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 90 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 125 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 91 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 126 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| @@ -99,22 +134,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 99 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 134 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 100 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 135 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 101 | CONFIG_NETFILTER_XT_MATCH_U32=m | 136 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 137 | CONFIG_IP_SET=m | ||
| 138 | CONFIG_IP_SET_BITMAP_IP=m | ||
| 139 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
| 140 | CONFIG_IP_SET_BITMAP_PORT=m | ||
| 141 | CONFIG_IP_SET_HASH_IP=m | ||
| 142 | CONFIG_IP_SET_HASH_IPPORT=m | ||
| 143 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
| 144 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
| 145 | CONFIG_IP_SET_HASH_NET=m | ||
| 146 | CONFIG_IP_SET_HASH_NETPORT=m | ||
| 147 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
| 148 | CONFIG_IP_SET_LIST_SET=m | ||
| 102 | CONFIG_NF_CONNTRACK_IPV4=m | 149 | CONFIG_NF_CONNTRACK_IPV4=m |
| 103 | CONFIG_IP_NF_QUEUE=m | ||
| 104 | CONFIG_IP_NF_IPTABLES=m | 150 | CONFIG_IP_NF_IPTABLES=m |
| 105 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 106 | CONFIG_IP_NF_MATCH_AH=m | 151 | CONFIG_IP_NF_MATCH_AH=m |
| 107 | CONFIG_IP_NF_MATCH_ECN=m | 152 | CONFIG_IP_NF_MATCH_ECN=m |
| 153 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
| 108 | CONFIG_IP_NF_MATCH_TTL=m | 154 | CONFIG_IP_NF_MATCH_TTL=m |
| 109 | CONFIG_IP_NF_FILTER=m | 155 | CONFIG_IP_NF_FILTER=m |
| 110 | CONFIG_IP_NF_TARGET_REJECT=m | 156 | CONFIG_IP_NF_TARGET_REJECT=m |
| 111 | CONFIG_IP_NF_TARGET_LOG=m | ||
| 112 | CONFIG_IP_NF_TARGET_ULOG=m | 157 | CONFIG_IP_NF_TARGET_ULOG=m |
| 113 | CONFIG_NF_NAT=m | 158 | CONFIG_NF_NAT_IPV4=m |
| 114 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 159 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 115 | CONFIG_IP_NF_TARGET_NETMAP=m | 160 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 116 | CONFIG_IP_NF_TARGET_REDIRECT=m | 161 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 117 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
| 118 | CONFIG_IP_NF_MANGLE=m | 162 | CONFIG_IP_NF_MANGLE=m |
| 119 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 163 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
| 120 | CONFIG_IP_NF_TARGET_ECN=m | 164 | CONFIG_IP_NF_TARGET_ECN=m |
| @@ -124,7 +168,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
| 124 | CONFIG_IP_NF_ARPFILTER=m | 168 | CONFIG_IP_NF_ARPFILTER=m |
| 125 | CONFIG_IP_NF_ARP_MANGLE=m | 169 | CONFIG_IP_NF_ARP_MANGLE=m |
| 126 | CONFIG_NF_CONNTRACK_IPV6=m | 170 | CONFIG_NF_CONNTRACK_IPV6=m |
| 127 | CONFIG_IP6_NF_QUEUE=m | ||
| 128 | CONFIG_IP6_NF_IPTABLES=m | 171 | CONFIG_IP6_NF_IPTABLES=m |
| 129 | CONFIG_IP6_NF_MATCH_AH=m | 172 | CONFIG_IP6_NF_MATCH_AH=m |
| 130 | CONFIG_IP6_NF_MATCH_EUI64=m | 173 | CONFIG_IP6_NF_MATCH_EUI64=m |
| @@ -133,21 +176,34 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
| 133 | CONFIG_IP6_NF_MATCH_HL=m | 176 | CONFIG_IP6_NF_MATCH_HL=m |
| 134 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 177 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 135 | CONFIG_IP6_NF_MATCH_MH=m | 178 | CONFIG_IP6_NF_MATCH_MH=m |
| 179 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
| 136 | CONFIG_IP6_NF_MATCH_RT=m | 180 | CONFIG_IP6_NF_MATCH_RT=m |
| 137 | CONFIG_IP6_NF_TARGET_HL=m | 181 | CONFIG_IP6_NF_TARGET_HL=m |
| 138 | CONFIG_IP6_NF_TARGET_LOG=m | ||
| 139 | CONFIG_IP6_NF_FILTER=m | 182 | CONFIG_IP6_NF_FILTER=m |
| 140 | CONFIG_IP6_NF_TARGET_REJECT=m | 183 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 141 | CONFIG_IP6_NF_MANGLE=m | 184 | CONFIG_IP6_NF_MANGLE=m |
| 142 | CONFIG_IP6_NF_RAW=m | 185 | CONFIG_IP6_NF_RAW=m |
| 186 | CONFIG_NF_NAT_IPV6=m | ||
| 187 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
| 188 | CONFIG_IP6_NF_TARGET_NPT=m | ||
| 143 | CONFIG_IP_DCCP=m | 189 | CONFIG_IP_DCCP=m |
| 144 | # CONFIG_IP_DCCP_CCID3 is not set | 190 | # CONFIG_IP_DCCP_CCID3 is not set |
| 191 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
| 192 | CONFIG_RDS=m | ||
| 193 | CONFIG_RDS_TCP=m | ||
| 194 | CONFIG_L2TP=m | ||
| 145 | CONFIG_ATALK=m | 195 | CONFIG_ATALK=m |
| 196 | CONFIG_BATMAN_ADV=m | ||
| 197 | CONFIG_BATMAN_ADV_DAT=y | ||
| 198 | # CONFIG_WIRELESS is not set | ||
| 146 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 199 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 200 | CONFIG_DEVTMPFS=y | ||
| 147 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 201 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
| 202 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
| 148 | CONFIG_CONNECTOR=m | 203 | CONFIG_CONNECTOR=m |
| 149 | CONFIG_BLK_DEV_LOOP=y | 204 | CONFIG_BLK_DEV_LOOP=y |
| 150 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 205 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
| 206 | CONFIG_BLK_DEV_DRBD=m | ||
| 151 | CONFIG_BLK_DEV_NBD=m | 207 | CONFIG_BLK_DEV_NBD=m |
| 152 | CONFIG_BLK_DEV_RAM=y | 208 | CONFIG_BLK_DEV_RAM=y |
| 153 | CONFIG_CDROM_PKTCDVD=m | 209 | CONFIG_CDROM_PKTCDVD=m |
| @@ -162,57 +218,74 @@ CONFIG_BLK_DEV_SR=y | |||
| 162 | CONFIG_BLK_DEV_SR_VENDOR=y | 218 | CONFIG_BLK_DEV_SR_VENDOR=y |
| 163 | CONFIG_CHR_DEV_SG=m | 219 | CONFIG_CHR_DEV_SG=m |
| 164 | CONFIG_SCSI_CONSTANTS=y | 220 | CONFIG_SCSI_CONSTANTS=y |
| 165 | CONFIG_SCSI_SAS_LIBSAS=m | 221 | CONFIG_SCSI_SAS_ATTRS=m |
| 166 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
| 167 | CONFIG_SCSI_SRP_ATTRS=m | ||
| 168 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
| 169 | CONFIG_ISCSI_TCP=m | 222 | CONFIG_ISCSI_TCP=m |
| 223 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
| 170 | CONFIG_MD=y | 224 | CONFIG_MD=y |
| 171 | CONFIG_BLK_DEV_MD=m | ||
| 172 | CONFIG_MD_LINEAR=m | 225 | CONFIG_MD_LINEAR=m |
| 173 | CONFIG_MD_RAID0=m | 226 | CONFIG_MD_RAID0=m |
| 174 | CONFIG_MD_RAID1=m | ||
| 175 | CONFIG_MD_RAID456=m | ||
| 176 | CONFIG_BLK_DEV_DM=m | 227 | CONFIG_BLK_DEV_DM=m |
| 177 | CONFIG_DM_CRYPT=m | 228 | CONFIG_DM_CRYPT=m |
| 178 | CONFIG_DM_SNAPSHOT=m | 229 | CONFIG_DM_SNAPSHOT=m |
| 230 | CONFIG_DM_THIN_PROVISIONING=m | ||
| 231 | CONFIG_DM_CACHE=m | ||
| 179 | CONFIG_DM_MIRROR=m | 232 | CONFIG_DM_MIRROR=m |
| 233 | CONFIG_DM_RAID=m | ||
| 180 | CONFIG_DM_ZERO=m | 234 | CONFIG_DM_ZERO=m |
| 181 | CONFIG_DM_MULTIPATH=m | 235 | CONFIG_DM_MULTIPATH=m |
| 182 | CONFIG_DM_UEVENT=y | 236 | CONFIG_DM_UEVENT=y |
| 237 | CONFIG_TARGET_CORE=m | ||
| 238 | CONFIG_TCM_IBLOCK=m | ||
| 239 | CONFIG_TCM_FILEIO=m | ||
| 240 | CONFIG_TCM_PSCSI=m | ||
| 183 | CONFIG_NETDEVICES=y | 241 | CONFIG_NETDEVICES=y |
| 184 | CONFIG_DUMMY=m | 242 | CONFIG_DUMMY=m |
| 185 | CONFIG_MACVLAN=m | ||
| 186 | CONFIG_EQUALIZER=m | 243 | CONFIG_EQUALIZER=m |
| 244 | CONFIG_NET_TEAM=m | ||
| 245 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
| 246 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
| 247 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
| 248 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
| 249 | CONFIG_VXLAN=m | ||
| 250 | CONFIG_NETCONSOLE=m | ||
| 251 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
| 187 | CONFIG_VETH=m | 252 | CONFIG_VETH=m |
| 188 | CONFIG_NET_ETHERNET=y | 253 | # CONFIG_NET_CADENCE is not set |
| 189 | # CONFIG_NETDEV_1000 is not set | 254 | # CONFIG_NET_VENDOR_BROADCOM is not set |
| 190 | # CONFIG_NETDEV_10000 is not set | 255 | # CONFIG_NET_VENDOR_INTEL is not set |
| 256 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
| 257 | # CONFIG_NET_VENDOR_MICREL is not set | ||
| 258 | # CONFIG_NET_VENDOR_NATSEMI is not set | ||
| 259 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
| 260 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
| 261 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
| 191 | CONFIG_PPP=m | 262 | CONFIG_PPP=m |
| 192 | CONFIG_PPP_FILTER=y | ||
| 193 | CONFIG_PPP_ASYNC=m | ||
| 194 | CONFIG_PPP_SYNC_TTY=m | ||
| 195 | CONFIG_PPP_DEFLATE=m | ||
| 196 | CONFIG_PPP_BSDCOMP=m | 263 | CONFIG_PPP_BSDCOMP=m |
| 264 | CONFIG_PPP_DEFLATE=m | ||
| 265 | CONFIG_PPP_FILTER=y | ||
| 197 | CONFIG_PPP_MPPE=m | 266 | CONFIG_PPP_MPPE=m |
| 198 | CONFIG_PPPOE=m | 267 | CONFIG_PPPOE=m |
| 268 | CONFIG_PPTP=m | ||
| 269 | CONFIG_PPPOL2TP=m | ||
| 270 | CONFIG_PPP_ASYNC=m | ||
| 271 | CONFIG_PPP_SYNC_TTY=m | ||
| 199 | CONFIG_SLIP=m | 272 | CONFIG_SLIP=m |
| 200 | CONFIG_SLIP_COMPRESSED=y | 273 | CONFIG_SLIP_COMPRESSED=y |
| 201 | CONFIG_SLIP_SMART=y | 274 | CONFIG_SLIP_SMART=y |
| 202 | CONFIG_SLIP_MODE_SLIP6=y | 275 | CONFIG_SLIP_MODE_SLIP6=y |
| 203 | CONFIG_NETCONSOLE=m | 276 | # CONFIG_WLAN is not set |
| 204 | CONFIG_NETCONSOLE_DYNAMIC=y | 277 | CONFIG_INPUT_EVDEV=m |
| 205 | CONFIG_INPUT_FF_MEMLESS=m | ||
| 206 | # CONFIG_KEYBOARD_ATKBD is not set | 278 | # CONFIG_KEYBOARD_ATKBD is not set |
| 207 | CONFIG_MOUSE_PS2=m | 279 | # CONFIG_MOUSE_PS2 is not set |
| 208 | CONFIG_MOUSE_SERIAL=m | 280 | CONFIG_MOUSE_SERIAL=m |
| 209 | CONFIG_SERIO=m | 281 | CONFIG_SERIO=m |
| 210 | # CONFIG_SERIO_SERPORT is not set | ||
| 211 | CONFIG_VT_HW_CONSOLE_BINDING=y | 282 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 283 | # CONFIG_LEGACY_PTYS is not set | ||
| 212 | # CONFIG_DEVKMEM is not set | 284 | # CONFIG_DEVKMEM is not set |
| 213 | # CONFIG_HW_RANDOM is not set | 285 | # CONFIG_HW_RANDOM is not set |
| 214 | CONFIG_GEN_RTC=m | 286 | CONFIG_NTP_PPS=y |
| 215 | CONFIG_GEN_RTC_X=y | 287 | CONFIG_PPS_CLIENT_LDISC=m |
| 288 | CONFIG_PTP_1588_CLOCK=m | ||
| 216 | # CONFIG_HWMON is not set | 289 | # CONFIG_HWMON is not set |
| 217 | CONFIG_FB=y | 290 | CONFIG_FB=y |
| 218 | CONFIG_FRAMEBUFFER_CONSOLE=y | 291 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| @@ -221,47 +294,61 @@ CONFIG_LOGO=y | |||
| 221 | # CONFIG_LOGO_LINUX_CLUT224 is not set | 294 | # CONFIG_LOGO_LINUX_CLUT224 is not set |
| 222 | CONFIG_HID=m | 295 | CONFIG_HID=m |
| 223 | CONFIG_HIDRAW=y | 296 | CONFIG_HIDRAW=y |
| 297 | CONFIG_UHID=m | ||
| 298 | # CONFIG_HID_GENERIC is not set | ||
| 224 | # CONFIG_USB_SUPPORT is not set | 299 | # CONFIG_USB_SUPPORT is not set |
| 300 | CONFIG_RTC_CLASS=y | ||
| 301 | CONFIG_RTC_DRV_GENERIC=m | ||
| 302 | # CONFIG_IOMMU_SUPPORT is not set | ||
| 303 | CONFIG_HEARTBEAT=y | ||
| 304 | CONFIG_PROC_HARDWARE=y | ||
| 225 | CONFIG_EXT2_FS=y | 305 | CONFIG_EXT2_FS=y |
| 226 | CONFIG_EXT3_FS=y | 306 | CONFIG_EXT3_FS=y |
| 227 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 307 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
| 228 | # CONFIG_EXT3_FS_XATTR is not set | 308 | # CONFIG_EXT3_FS_XATTR is not set |
| 309 | CONFIG_EXT4_FS=y | ||
| 229 | CONFIG_REISERFS_FS=m | 310 | CONFIG_REISERFS_FS=m |
| 230 | CONFIG_JFS_FS=m | 311 | CONFIG_JFS_FS=m |
| 231 | CONFIG_XFS_FS=m | 312 | CONFIG_XFS_FS=m |
| 232 | CONFIG_OCFS2_FS=m | 313 | CONFIG_OCFS2_FS=m |
| 233 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 234 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 314 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 315 | CONFIG_FANOTIFY=y | ||
| 235 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 316 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 236 | # CONFIG_PRINT_QUOTA_WARNING is not set | 317 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 237 | CONFIG_AUTOFS_FS=m | ||
| 238 | CONFIG_AUTOFS4_FS=m | 318 | CONFIG_AUTOFS4_FS=m |
| 239 | CONFIG_FUSE_FS=m | 319 | CONFIG_FUSE_FS=m |
| 320 | CONFIG_CUSE=m | ||
| 240 | CONFIG_ISO9660_FS=y | 321 | CONFIG_ISO9660_FS=y |
| 241 | CONFIG_JOLIET=y | 322 | CONFIG_JOLIET=y |
| 242 | CONFIG_ZISOFS=y | 323 | CONFIG_ZISOFS=y |
| 243 | CONFIG_UDF_FS=m | 324 | CONFIG_UDF_FS=m |
| 244 | CONFIG_MSDOS_FS=y | 325 | CONFIG_MSDOS_FS=m |
| 245 | CONFIG_VFAT_FS=m | 326 | CONFIG_VFAT_FS=m |
| 246 | CONFIG_PROC_KCORE=y | 327 | CONFIG_PROC_KCORE=y |
| 247 | CONFIG_TMPFS=y | 328 | CONFIG_TMPFS=y |
| 248 | CONFIG_AFFS_FS=m | 329 | CONFIG_AFFS_FS=m |
| 330 | CONFIG_ECRYPT_FS=m | ||
| 331 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
| 249 | CONFIG_HFS_FS=m | 332 | CONFIG_HFS_FS=m |
| 250 | CONFIG_HFSPLUS_FS=m | 333 | CONFIG_HFSPLUS_FS=m |
| 251 | CONFIG_CRAMFS=m | 334 | CONFIG_CRAMFS=m |
| 252 | CONFIG_SQUASHFS=m | 335 | CONFIG_SQUASHFS=m |
| 253 | CONFIG_MINIX_FS=y | 336 | CONFIG_SQUASHFS_LZO=y |
| 337 | CONFIG_MINIX_FS=m | ||
| 338 | CONFIG_OMFS_FS=m | ||
| 254 | CONFIG_HPFS_FS=m | 339 | CONFIG_HPFS_FS=m |
| 340 | CONFIG_QNX4FS_FS=m | ||
| 341 | CONFIG_QNX6FS_FS=m | ||
| 255 | CONFIG_SYSV_FS=m | 342 | CONFIG_SYSV_FS=m |
| 256 | CONFIG_UFS_FS=m | 343 | CONFIG_UFS_FS=m |
| 257 | CONFIG_NFS_FS=y | 344 | CONFIG_NFS_FS=y |
| 258 | CONFIG_NFS_V3=y | ||
| 259 | CONFIG_NFS_V4=y | 345 | CONFIG_NFS_V4=y |
| 346 | CONFIG_NFS_SWAP=y | ||
| 260 | CONFIG_ROOT_NFS=y | 347 | CONFIG_ROOT_NFS=y |
| 261 | CONFIG_NFSD=m | 348 | CONFIG_NFSD=m |
| 262 | CONFIG_NFSD_V3=y | 349 | CONFIG_NFSD_V3=y |
| 263 | CONFIG_SMB_FS=m | 350 | CONFIG_CIFS=m |
| 264 | CONFIG_SMB_NLS_DEFAULT=y | 351 | # CONFIG_CIFS_DEBUG is not set |
| 265 | CONFIG_CODA_FS=m | 352 | CONFIG_CODA_FS=m |
| 266 | CONFIG_NLS_CODEPAGE_437=y | 353 | CONFIG_NLS_CODEPAGE_437=y |
| 267 | CONFIG_NLS_CODEPAGE_737=m | 354 | CONFIG_NLS_CODEPAGE_737=m |
| @@ -300,10 +387,23 @@ CONFIG_NLS_ISO8859_14=m | |||
| 300 | CONFIG_NLS_ISO8859_15=m | 387 | CONFIG_NLS_ISO8859_15=m |
| 301 | CONFIG_NLS_KOI8_R=m | 388 | CONFIG_NLS_KOI8_R=m |
| 302 | CONFIG_NLS_KOI8_U=m | 389 | CONFIG_NLS_KOI8_U=m |
| 390 | CONFIG_NLS_MAC_ROMAN=m | ||
| 391 | CONFIG_NLS_MAC_CELTIC=m | ||
| 392 | CONFIG_NLS_MAC_CENTEURO=m | ||
| 393 | CONFIG_NLS_MAC_CROATIAN=m | ||
| 394 | CONFIG_NLS_MAC_CYRILLIC=m | ||
| 395 | CONFIG_NLS_MAC_GAELIC=m | ||
| 396 | CONFIG_NLS_MAC_GREEK=m | ||
| 397 | CONFIG_NLS_MAC_ICELAND=m | ||
| 398 | CONFIG_NLS_MAC_INUIT=m | ||
| 399 | CONFIG_NLS_MAC_ROMANIAN=m | ||
| 400 | CONFIG_NLS_MAC_TURKISH=m | ||
| 303 | CONFIG_DLM=m | 401 | CONFIG_DLM=m |
| 304 | CONFIG_MAGIC_SYSRQ=y | 402 | CONFIG_MAGIC_SYSRQ=y |
| 305 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 403 | CONFIG_ASYNC_RAID6_TEST=m |
| 306 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 404 | CONFIG_ENCRYPTED_KEYS=m |
| 405 | CONFIG_CRYPTO_MANAGER=y | ||
| 406 | CONFIG_CRYPTO_USER=m | ||
| 307 | CONFIG_CRYPTO_NULL=m | 407 | CONFIG_CRYPTO_NULL=m |
| 308 | CONFIG_CRYPTO_CRYPTD=m | 408 | CONFIG_CRYPTO_CRYPTD=m |
| 309 | CONFIG_CRYPTO_TEST=m | 409 | CONFIG_CRYPTO_TEST=m |
| @@ -313,19 +413,16 @@ CONFIG_CRYPTO_CTS=m | |||
| 313 | CONFIG_CRYPTO_LRW=m | 413 | CONFIG_CRYPTO_LRW=m |
| 314 | CONFIG_CRYPTO_PCBC=m | 414 | CONFIG_CRYPTO_PCBC=m |
| 315 | CONFIG_CRYPTO_XTS=m | 415 | CONFIG_CRYPTO_XTS=m |
| 316 | CONFIG_CRYPTO_HMAC=y | ||
| 317 | CONFIG_CRYPTO_XCBC=m | 416 | CONFIG_CRYPTO_XCBC=m |
| 318 | CONFIG_CRYPTO_MD4=m | 417 | CONFIG_CRYPTO_VMAC=m |
| 319 | CONFIG_CRYPTO_MICHAEL_MIC=m | 418 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 320 | CONFIG_CRYPTO_RMD128=m | 419 | CONFIG_CRYPTO_RMD128=m |
| 321 | CONFIG_CRYPTO_RMD160=m | 420 | CONFIG_CRYPTO_RMD160=m |
| 322 | CONFIG_CRYPTO_RMD256=m | 421 | CONFIG_CRYPTO_RMD256=m |
| 323 | CONFIG_CRYPTO_RMD320=m | 422 | CONFIG_CRYPTO_RMD320=m |
| 324 | CONFIG_CRYPTO_SHA256=m | ||
| 325 | CONFIG_CRYPTO_SHA512=m | 423 | CONFIG_CRYPTO_SHA512=m |
| 326 | CONFIG_CRYPTO_TGR192=m | 424 | CONFIG_CRYPTO_TGR192=m |
| 327 | CONFIG_CRYPTO_WP512=m | 425 | CONFIG_CRYPTO_WP512=m |
| 328 | CONFIG_CRYPTO_AES=m | ||
| 329 | CONFIG_CRYPTO_ANUBIS=m | 426 | CONFIG_CRYPTO_ANUBIS=m |
| 330 | CONFIG_CRYPTO_BLOWFISH=m | 427 | CONFIG_CRYPTO_BLOWFISH=m |
| 331 | CONFIG_CRYPTO_CAMELLIA=m | 428 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -341,6 +438,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
| 341 | CONFIG_CRYPTO_ZLIB=m | 438 | CONFIG_CRYPTO_ZLIB=m |
| 342 | CONFIG_CRYPTO_LZO=m | 439 | CONFIG_CRYPTO_LZO=m |
| 343 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 440 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 441 | CONFIG_CRYPTO_USER_API_HASH=m | ||
| 442 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
| 344 | # CONFIG_CRYPTO_HW is not set | 443 | # CONFIG_CRYPTO_HW is not set |
| 345 | CONFIG_CRC16=m | ||
| 346 | CONFIG_CRC_T10DIF=y | 444 | CONFIG_CRC_T10DIF=y |
| 445 | CONFIG_XZ_DEC_X86=y | ||
| 446 | CONFIG_XZ_DEC_POWERPC=y | ||
| 447 | CONFIG_XZ_DEC_IA64=y | ||
| 448 | CONFIG_XZ_DEC_ARM=y | ||
| 449 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
| 450 | CONFIG_XZ_DEC_SPARC=y | ||
| 451 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index 4571d33903fe..6d5370c914b2 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig | |||
| @@ -1,53 +1,75 @@ | |||
| 1 | CONFIG_EXPERIMENTAL=y | ||
| 2 | CONFIG_LOCALVERSION="-atari" | 1 | CONFIG_LOCALVERSION="-atari" |
| 3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
| 4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
| 4 | CONFIG_FHANDLE=y | ||
| 5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
| 6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
| 7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
| 8 | # CONFIG_UTS_NS is not set | ||
| 9 | # CONFIG_IPC_NS is not set | ||
| 10 | # CONFIG_PID_NS is not set | ||
| 11 | # CONFIG_NET_NS is not set | ||
| 8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
| 9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
| 11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
| 12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
| 13 | CONFIG_ATARI=y | 16 | CONFIG_PARTITION_ADVANCED=y |
| 17 | CONFIG_AMIGA_PARTITION=y | ||
| 18 | CONFIG_MAC_PARTITION=y | ||
| 19 | CONFIG_BSD_DISKLABEL=y | ||
| 20 | CONFIG_MINIX_SUBPARTITION=y | ||
| 21 | CONFIG_SOLARIS_X86_PARTITION=y | ||
| 22 | CONFIG_UNIXWARE_DISKLABEL=y | ||
| 23 | CONFIG_SUN_PARTITION=y | ||
| 24 | # CONFIG_EFI_PARTITION is not set | ||
| 25 | CONFIG_SYSV68_PARTITION=y | ||
| 26 | CONFIG_IOSCHED_DEADLINE=m | ||
| 14 | CONFIG_M68020=y | 27 | CONFIG_M68020=y |
| 15 | CONFIG_M68030=y | 28 | CONFIG_M68030=y |
| 16 | CONFIG_M68040=y | 29 | CONFIG_M68040=y |
| 17 | CONFIG_M68060=y | 30 | CONFIG_M68060=y |
| 31 | CONFIG_ATARI=y | ||
| 32 | # CONFIG_COMPACTION is not set | ||
| 33 | CONFIG_CLEANCACHE=y | ||
| 34 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 18 | CONFIG_BINFMT_AOUT=m | 35 | CONFIG_BINFMT_AOUT=m |
| 19 | CONFIG_BINFMT_MISC=m | 36 | CONFIG_BINFMT_MISC=m |
| 20 | CONFIG_STRAM_PROC=y | ||
| 21 | CONFIG_HEARTBEAT=y | ||
| 22 | CONFIG_PROC_HARDWARE=y | ||
| 23 | CONFIG_NET=y | 37 | CONFIG_NET=y |
| 24 | CONFIG_PACKET=y | 38 | CONFIG_PACKET=y |
| 39 | CONFIG_PACKET_DIAG=m | ||
| 25 | CONFIG_UNIX=y | 40 | CONFIG_UNIX=y |
| 41 | CONFIG_UNIX_DIAG=m | ||
| 42 | CONFIG_XFRM_MIGRATE=y | ||
| 26 | CONFIG_NET_KEY=y | 43 | CONFIG_NET_KEY=y |
| 27 | CONFIG_NET_KEY_MIGRATE=y | ||
| 28 | CONFIG_INET=y | 44 | CONFIG_INET=y |
| 29 | CONFIG_IP_PNP=y | 45 | CONFIG_IP_PNP=y |
| 46 | CONFIG_IP_PNP_DHCP=y | ||
| 47 | CONFIG_IP_PNP_BOOTP=y | ||
| 48 | CONFIG_IP_PNP_RARP=y | ||
| 30 | CONFIG_NET_IPIP=m | 49 | CONFIG_NET_IPIP=m |
| 50 | CONFIG_NET_IPGRE_DEMUX=m | ||
| 31 | CONFIG_NET_IPGRE=m | 51 | CONFIG_NET_IPGRE=m |
| 32 | CONFIG_SYN_COOKIES=y | 52 | CONFIG_SYN_COOKIES=y |
| 53 | CONFIG_NET_IPVTI=m | ||
| 33 | CONFIG_INET_AH=m | 54 | CONFIG_INET_AH=m |
| 34 | CONFIG_INET_ESP=m | 55 | CONFIG_INET_ESP=m |
| 35 | CONFIG_INET_IPCOMP=m | 56 | CONFIG_INET_IPCOMP=m |
| 36 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 57 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 37 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 58 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 38 | CONFIG_INET_XFRM_MODE_BEET=m | 59 | CONFIG_INET_XFRM_MODE_BEET=m |
| 60 | # CONFIG_INET_LRO is not set | ||
| 39 | CONFIG_INET_DIAG=m | 61 | CONFIG_INET_DIAG=m |
| 62 | CONFIG_INET_UDP_DIAG=m | ||
| 40 | CONFIG_IPV6_PRIVACY=y | 63 | CONFIG_IPV6_PRIVACY=y |
| 41 | CONFIG_IPV6_ROUTER_PREF=y | 64 | CONFIG_IPV6_ROUTER_PREF=y |
| 42 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 43 | CONFIG_INET6_AH=m | 65 | CONFIG_INET6_AH=m |
| 44 | CONFIG_INET6_ESP=m | 66 | CONFIG_INET6_ESP=m |
| 45 | CONFIG_INET6_IPCOMP=m | 67 | CONFIG_INET6_IPCOMP=m |
| 46 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 68 | CONFIG_IPV6_GRE=m |
| 47 | CONFIG_IPV6_TUNNEL=m | ||
| 48 | CONFIG_NETFILTER=y | 69 | CONFIG_NETFILTER=y |
| 49 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
| 50 | CONFIG_NF_CONNTRACK=m | 70 | CONFIG_NF_CONNTRACK=m |
| 71 | CONFIG_NF_CONNTRACK_ZONES=y | ||
| 72 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
| 51 | # CONFIG_NF_CT_PROTO_DCCP is not set | 73 | # CONFIG_NF_CT_PROTO_DCCP is not set |
| 52 | CONFIG_NF_CT_PROTO_UDPLITE=m | 74 | CONFIG_NF_CT_PROTO_UDPLITE=m |
| 53 | CONFIG_NF_CONNTRACK_AMANDA=m | 75 | CONFIG_NF_CONNTRACK_AMANDA=m |
| @@ -55,25 +77,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
| 55 | CONFIG_NF_CONNTRACK_H323=m | 77 | CONFIG_NF_CONNTRACK_H323=m |
| 56 | CONFIG_NF_CONNTRACK_IRC=m | 78 | CONFIG_NF_CONNTRACK_IRC=m |
| 57 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 79 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
| 80 | CONFIG_NF_CONNTRACK_SNMP=m | ||
| 58 | CONFIG_NF_CONNTRACK_PPTP=m | 81 | CONFIG_NF_CONNTRACK_PPTP=m |
| 59 | CONFIG_NF_CONNTRACK_SANE=m | 82 | CONFIG_NF_CONNTRACK_SANE=m |
| 60 | CONFIG_NF_CONNTRACK_SIP=m | 83 | CONFIG_NF_CONNTRACK_SIP=m |
| 61 | CONFIG_NF_CONNTRACK_TFTP=m | 84 | CONFIG_NF_CONNTRACK_TFTP=m |
| 85 | CONFIG_NETFILTER_XT_SET=m | ||
| 86 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
| 62 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 87 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 63 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 88 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 64 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 89 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 90 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
| 91 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
| 92 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
| 65 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 93 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 66 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 94 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 67 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 95 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 96 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
| 97 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
| 68 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 98 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 69 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 99 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 70 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 100 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 101 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
| 102 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
| 71 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 103 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
| 72 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 104 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 73 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 105 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 106 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
| 74 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 107 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| 75 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 108 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 76 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 109 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 110 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
| 77 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 111 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 78 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 112 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 79 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 113 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| @@ -84,6 +118,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
| 84 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 118 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 85 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 119 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 86 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 120 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
| 121 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
| 122 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
| 87 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 123 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 88 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 124 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 89 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 125 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| @@ -97,22 +133,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 97 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 133 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 98 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 134 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 99 | CONFIG_NETFILTER_XT_MATCH_U32=m | 135 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 136 | CONFIG_IP_SET=m | ||
| 137 | CONFIG_IP_SET_BITMAP_IP=m | ||
| 138 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
| 139 | CONFIG_IP_SET_BITMAP_PORT=m | ||
| 140 | CONFIG_IP_SET_HASH_IP=m | ||
| 141 | CONFIG_IP_SET_HASH_IPPORT=m | ||
| 142 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
| 143 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
| 144 | CONFIG_IP_SET_HASH_NET=m | ||
| 145 | CONFIG_IP_SET_HASH_NETPORT=m | ||
| 146 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
| 147 | CONFIG_IP_SET_LIST_SET=m | ||
| 100 | CONFIG_NF_CONNTRACK_IPV4=m | 148 | CONFIG_NF_CONNTRACK_IPV4=m |
| 101 | CONFIG_IP_NF_QUEUE=m | ||
| 102 | CONFIG_IP_NF_IPTABLES=m | 149 | CONFIG_IP_NF_IPTABLES=m |
| 103 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 104 | CONFIG_IP_NF_MATCH_AH=m | 150 | CONFIG_IP_NF_MATCH_AH=m |
| 105 | CONFIG_IP_NF_MATCH_ECN=m | 151 | CONFIG_IP_NF_MATCH_ECN=m |
| 152 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
| 106 | CONFIG_IP_NF_MATCH_TTL=m | 153 | CONFIG_IP_NF_MATCH_TTL=m |
| 107 | CONFIG_IP_NF_FILTER=m | 154 | CONFIG_IP_NF_FILTER=m |
| 108 | CONFIG_IP_NF_TARGET_REJECT=m | 155 | CONFIG_IP_NF_TARGET_REJECT=m |
| 109 | CONFIG_IP_NF_TARGET_LOG=m | ||
| 110 | CONFIG_IP_NF_TARGET_ULOG=m | 156 | CONFIG_IP_NF_TARGET_ULOG=m |
| 111 | CONFIG_NF_NAT=m | 157 | CONFIG_NF_NAT_IPV4=m |
| 112 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 158 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 113 | CONFIG_IP_NF_TARGET_NETMAP=m | 159 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 114 | CONFIG_IP_NF_TARGET_REDIRECT=m | 160 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 115 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
| 116 | CONFIG_IP_NF_MANGLE=m | 161 | CONFIG_IP_NF_MANGLE=m |
| 117 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 162 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
| 118 | CONFIG_IP_NF_TARGET_ECN=m | 163 | CONFIG_IP_NF_TARGET_ECN=m |
| @@ -122,7 +167,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
| 122 | CONFIG_IP_NF_ARPFILTER=m | 167 | CONFIG_IP_NF_ARPFILTER=m |
| 123 | CONFIG_IP_NF_ARP_MANGLE=m | 168 | CONFIG_IP_NF_ARP_MANGLE=m |
| 124 | CONFIG_NF_CONNTRACK_IPV6=m | 169 | CONFIG_NF_CONNTRACK_IPV6=m |
| 125 | CONFIG_IP6_NF_QUEUE=m | ||
| 126 | CONFIG_IP6_NF_IPTABLES=m | 170 | CONFIG_IP6_NF_IPTABLES=m |
| 127 | CONFIG_IP6_NF_MATCH_AH=m | 171 | CONFIG_IP6_NF_MATCH_AH=m |
| 128 | CONFIG_IP6_NF_MATCH_EUI64=m | 172 | CONFIG_IP6_NF_MATCH_EUI64=m |
| @@ -131,18 +175,30 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
| 131 | CONFIG_IP6_NF_MATCH_HL=m | 175 | CONFIG_IP6_NF_MATCH_HL=m |
| 132 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 176 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 133 | CONFIG_IP6_NF_MATCH_MH=m | 177 | CONFIG_IP6_NF_MATCH_MH=m |
| 178 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
| 134 | CONFIG_IP6_NF_MATCH_RT=m | 179 | CONFIG_IP6_NF_MATCH_RT=m |
| 135 | CONFIG_IP6_NF_TARGET_HL=m | 180 | CONFIG_IP6_NF_TARGET_HL=m |
| 136 | CONFIG_IP6_NF_TARGET_LOG=m | ||
| 137 | CONFIG_IP6_NF_FILTER=m | 181 | CONFIG_IP6_NF_FILTER=m |
| 138 | CONFIG_IP6_NF_TARGET_REJECT=m | 182 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 139 | CONFIG_IP6_NF_MANGLE=m | 183 | CONFIG_IP6_NF_MANGLE=m |
| 140 | CONFIG_IP6_NF_RAW=m | 184 | CONFIG_IP6_NF_RAW=m |
| 185 | CONFIG_NF_NAT_IPV6=m | ||
| 186 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
| 187 | CONFIG_IP6_NF_TARGET_NPT=m | ||
| 141 | CONFIG_IP_DCCP=m | 188 | CONFIG_IP_DCCP=m |
| 142 | # CONFIG_IP_DCCP_CCID3 is not set | 189 | # CONFIG_IP_DCCP_CCID3 is not set |
| 190 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
| 191 | CONFIG_RDS=m | ||
| 192 | CONFIG_RDS_TCP=m | ||
| 193 | CONFIG_L2TP=m | ||
| 143 | CONFIG_ATALK=m | 194 | CONFIG_ATALK=m |
| 195 | CONFIG_BATMAN_ADV=m | ||
| 196 | CONFIG_BATMAN_ADV_DAT=y | ||
| 197 | # CONFIG_WIRELESS is not set | ||
| 144 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 198 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 199 | CONFIG_DEVTMPFS=y | ||
| 145 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 200 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
| 201 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
| 146 | CONFIG_CONNECTOR=m | 202 | CONFIG_CONNECTOR=m |
| 147 | CONFIG_PARPORT=m | 203 | CONFIG_PARPORT=m |
| 148 | CONFIG_PARPORT_ATARI=m | 204 | CONFIG_PARPORT_ATARI=m |
| @@ -150,11 +206,13 @@ CONFIG_PARPORT_1284=y | |||
| 150 | CONFIG_ATARI_FLOPPY=y | 206 | CONFIG_ATARI_FLOPPY=y |
| 151 | CONFIG_BLK_DEV_LOOP=y | 207 | CONFIG_BLK_DEV_LOOP=y |
| 152 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 208 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
| 209 | CONFIG_BLK_DEV_DRBD=m | ||
| 153 | CONFIG_BLK_DEV_NBD=m | 210 | CONFIG_BLK_DEV_NBD=m |
| 154 | CONFIG_BLK_DEV_RAM=y | 211 | CONFIG_BLK_DEV_RAM=y |
| 155 | CONFIG_CDROM_PKTCDVD=m | 212 | CONFIG_CDROM_PKTCDVD=m |
| 156 | CONFIG_ATA_OVER_ETH=m | 213 | CONFIG_ATA_OVER_ETH=m |
| 157 | CONFIG_IDE=y | 214 | CONFIG_IDE=y |
| 215 | CONFIG_IDE_GD_ATAPI=y | ||
| 158 | CONFIG_BLK_DEV_IDECD=y | 216 | CONFIG_BLK_DEV_IDECD=y |
| 159 | CONFIG_BLK_DEV_FALCON_IDE=y | 217 | CONFIG_BLK_DEV_FALCON_IDE=y |
| 160 | CONFIG_RAID_ATTRS=m | 218 | CONFIG_RAID_ATTRS=m |
| @@ -167,63 +225,81 @@ CONFIG_BLK_DEV_SR=y | |||
| 167 | CONFIG_BLK_DEV_SR_VENDOR=y | 225 | CONFIG_BLK_DEV_SR_VENDOR=y |
| 168 | CONFIG_CHR_DEV_SG=m | 226 | CONFIG_CHR_DEV_SG=m |
| 169 | CONFIG_SCSI_CONSTANTS=y | 227 | CONFIG_SCSI_CONSTANTS=y |
| 170 | CONFIG_SCSI_SAS_LIBSAS=m | 228 | CONFIG_SCSI_SAS_ATTRS=m |
| 171 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
| 172 | CONFIG_SCSI_SRP_ATTRS=m | ||
| 173 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
| 174 | CONFIG_ISCSI_TCP=m | 229 | CONFIG_ISCSI_TCP=m |
| 230 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
| 175 | CONFIG_ATARI_SCSI=y | 231 | CONFIG_ATARI_SCSI=y |
| 176 | CONFIG_MD=y | 232 | CONFIG_MD=y |
| 177 | CONFIG_BLK_DEV_MD=m | ||
| 178 | CONFIG_MD_LINEAR=m | 233 | CONFIG_MD_LINEAR=m |
| 179 | CONFIG_MD_RAID0=m | 234 | CONFIG_MD_RAID0=m |
| 180 | CONFIG_MD_RAID1=m | ||
| 181 | CONFIG_MD_RAID456=m | ||
| 182 | CONFIG_BLK_DEV_DM=m | 235 | CONFIG_BLK_DEV_DM=m |
| 183 | CONFIG_DM_CRYPT=m | 236 | CONFIG_DM_CRYPT=m |
| 184 | CONFIG_DM_SNAPSHOT=m | 237 | CONFIG_DM_SNAPSHOT=m |
| 238 | CONFIG_DM_THIN_PROVISIONING=m | ||
| 239 | CONFIG_DM_CACHE=m | ||
| 185 | CONFIG_DM_MIRROR=m | 240 | CONFIG_DM_MIRROR=m |
| 241 | CONFIG_DM_RAID=m | ||
| 186 | CONFIG_DM_ZERO=m | 242 | CONFIG_DM_ZERO=m |
| 187 | CONFIG_DM_MULTIPATH=m | 243 | CONFIG_DM_MULTIPATH=m |
| 188 | CONFIG_DM_UEVENT=y | 244 | CONFIG_DM_UEVENT=y |
| 245 | CONFIG_TARGET_CORE=m | ||
| 246 | CONFIG_TCM_IBLOCK=m | ||
| 247 | CONFIG_TCM_FILEIO=m | ||
| 248 | CONFIG_TCM_PSCSI=m | ||
| 189 | CONFIG_NETDEVICES=y | 249 | CONFIG_NETDEVICES=y |
| 190 | CONFIG_DUMMY=m | 250 | CONFIG_DUMMY=m |
| 191 | CONFIG_MACVLAN=m | ||
| 192 | CONFIG_EQUALIZER=m | 251 | CONFIG_EQUALIZER=m |
| 193 | CONFIG_VETH=m | ||
| 194 | CONFIG_NET_ETHERNET=y | ||
| 195 | CONFIG_MII=y | 252 | CONFIG_MII=y |
| 253 | CONFIG_NET_TEAM=m | ||
| 254 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
| 255 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
| 256 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
| 257 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
| 258 | CONFIG_VXLAN=m | ||
| 259 | CONFIG_NETCONSOLE=m | ||
| 260 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
| 261 | CONFIG_VETH=m | ||
| 196 | CONFIG_ATARILANCE=y | 262 | CONFIG_ATARILANCE=y |
| 197 | # CONFIG_NETDEV_1000 is not set | 263 | # CONFIG_NET_CADENCE is not set |
| 198 | # CONFIG_NETDEV_10000 is not set | 264 | # CONFIG_NET_VENDOR_BROADCOM is not set |
| 265 | # CONFIG_NET_VENDOR_INTEL is not set | ||
| 266 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
| 267 | # CONFIG_NET_VENDOR_MICREL is not set | ||
| 268 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
| 269 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
| 270 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
| 199 | CONFIG_PPP=m | 271 | CONFIG_PPP=m |
| 200 | CONFIG_PPP_FILTER=y | ||
| 201 | CONFIG_PPP_ASYNC=m | ||
| 202 | CONFIG_PPP_SYNC_TTY=m | ||
| 203 | CONFIG_PPP_DEFLATE=m | ||
| 204 | CONFIG_PPP_BSDCOMP=m | 272 | CONFIG_PPP_BSDCOMP=m |
| 273 | CONFIG_PPP_DEFLATE=m | ||
| 274 | CONFIG_PPP_FILTER=y | ||
| 205 | CONFIG_PPP_MPPE=m | 275 | CONFIG_PPP_MPPE=m |
| 206 | CONFIG_PPPOE=m | 276 | CONFIG_PPPOE=m |
| 277 | CONFIG_PPTP=m | ||
| 278 | CONFIG_PPPOL2TP=m | ||
| 279 | CONFIG_PPP_ASYNC=m | ||
| 280 | CONFIG_PPP_SYNC_TTY=m | ||
| 207 | CONFIG_SLIP=m | 281 | CONFIG_SLIP=m |
| 208 | CONFIG_SLIP_COMPRESSED=y | 282 | CONFIG_SLIP_COMPRESSED=y |
| 209 | CONFIG_SLIP_SMART=y | 283 | CONFIG_SLIP_SMART=y |
| 210 | CONFIG_SLIP_MODE_SLIP6=y | 284 | CONFIG_SLIP_MODE_SLIP6=y |
| 211 | CONFIG_NETCONSOLE=m | 285 | # CONFIG_WLAN is not set |
| 212 | CONFIG_NETCONSOLE_DYNAMIC=y | 286 | CONFIG_INPUT_EVDEV=m |
| 213 | CONFIG_INPUT_FF_MEMLESS=m | ||
| 214 | CONFIG_KEYBOARD_ATARI=y | 287 | CONFIG_KEYBOARD_ATARI=y |
| 215 | # CONFIG_KEYBOARD_ATKBD is not set | 288 | # CONFIG_KEYBOARD_ATKBD is not set |
| 216 | CONFIG_MOUSE_PS2=m | 289 | # CONFIG_MOUSE_PS2 is not set |
| 217 | CONFIG_MOUSE_ATARI=m | 290 | CONFIG_MOUSE_ATARI=m |
| 218 | CONFIG_INPUT_MISC=y | 291 | CONFIG_INPUT_MISC=y |
| 219 | CONFIG_INPUT_M68K_BEEP=m | 292 | CONFIG_INPUT_M68K_BEEP=m |
| 220 | # CONFIG_SERIO_SERPORT is not set | 293 | # CONFIG_SERIO is not set |
| 221 | CONFIG_VT_HW_CONSOLE_BINDING=y | 294 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 295 | # CONFIG_LEGACY_PTYS is not set | ||
| 222 | # CONFIG_DEVKMEM is not set | 296 | # CONFIG_DEVKMEM is not set |
| 223 | CONFIG_PRINTER=m | 297 | CONFIG_PRINTER=m |
| 224 | # CONFIG_HW_RANDOM is not set | 298 | # CONFIG_HW_RANDOM is not set |
| 225 | CONFIG_GEN_RTC=m | 299 | CONFIG_NTP_PPS=y |
| 226 | CONFIG_GEN_RTC_X=y | 300 | CONFIG_PPS_CLIENT_LDISC=m |
| 301 | CONFIG_PPS_CLIENT_PARPORT=m | ||
| 302 | CONFIG_PTP_1588_CLOCK=m | ||
| 227 | # CONFIG_HWMON is not set | 303 | # CONFIG_HWMON is not set |
| 228 | CONFIG_FB=y | 304 | CONFIG_FB=y |
| 229 | CONFIG_FB_ATARI=y | 305 | CONFIG_FB_ATARI=y |
| @@ -233,47 +309,64 @@ CONFIG_SOUND=m | |||
| 233 | CONFIG_DMASOUND_ATARI=m | 309 | CONFIG_DMASOUND_ATARI=m |
| 234 | CONFIG_HID=m | 310 | CONFIG_HID=m |
| 235 | CONFIG_HIDRAW=y | 311 | CONFIG_HIDRAW=y |
| 236 | # CONFIG_USB_SUPPORT is not set | 312 | CONFIG_UHID=m |
| 313 | CONFIG_RTC_CLASS=y | ||
| 314 | CONFIG_RTC_DRV_GENERIC=m | ||
| 315 | # CONFIG_IOMMU_SUPPORT is not set | ||
| 316 | CONFIG_HEARTBEAT=y | ||
| 317 | CONFIG_PROC_HARDWARE=y | ||
| 318 | CONFIG_NATFEAT=y | ||
| 319 | CONFIG_NFBLOCK=y | ||
| 320 | CONFIG_NFCON=y | ||
| 321 | CONFIG_NFETH=y | ||
| 237 | CONFIG_ATARI_DSP56K=m | 322 | CONFIG_ATARI_DSP56K=m |
| 238 | CONFIG_EXT2_FS=y | 323 | CONFIG_EXT2_FS=y |
| 239 | CONFIG_EXT3_FS=y | 324 | CONFIG_EXT3_FS=y |
| 240 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 325 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
| 241 | # CONFIG_EXT3_FS_XATTR is not set | 326 | # CONFIG_EXT3_FS_XATTR is not set |
| 327 | CONFIG_EXT4_FS=y | ||
| 242 | CONFIG_REISERFS_FS=m | 328 | CONFIG_REISERFS_FS=m |
| 243 | CONFIG_JFS_FS=m | 329 | CONFIG_JFS_FS=m |
| 244 | CONFIG_XFS_FS=m | 330 | CONFIG_XFS_FS=m |
| 245 | CONFIG_OCFS2_FS=m | 331 | CONFIG_OCFS2_FS=m |
| 246 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 247 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 332 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 333 | CONFIG_FANOTIFY=y | ||
| 248 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 334 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 249 | # CONFIG_PRINT_QUOTA_WARNING is not set | 335 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 250 | CONFIG_AUTOFS_FS=m | ||
| 251 | CONFIG_AUTOFS4_FS=m | 336 | CONFIG_AUTOFS4_FS=m |
| 252 | CONFIG_FUSE_FS=m | 337 | CONFIG_FUSE_FS=m |
| 338 | CONFIG_CUSE=m | ||
| 253 | CONFIG_ISO9660_FS=y | 339 | CONFIG_ISO9660_FS=y |
| 254 | CONFIG_JOLIET=y | 340 | CONFIG_JOLIET=y |
| 255 | CONFIG_ZISOFS=y | 341 | CONFIG_ZISOFS=y |
| 256 | CONFIG_UDF_FS=m | 342 | CONFIG_UDF_FS=m |
| 257 | CONFIG_MSDOS_FS=y | 343 | CONFIG_MSDOS_FS=m |
| 258 | CONFIG_VFAT_FS=m | 344 | CONFIG_VFAT_FS=m |
| 259 | CONFIG_PROC_KCORE=y | 345 | CONFIG_PROC_KCORE=y |
| 260 | CONFIG_TMPFS=y | 346 | CONFIG_TMPFS=y |
| 261 | CONFIG_AFFS_FS=m | 347 | CONFIG_AFFS_FS=m |
| 348 | CONFIG_ECRYPT_FS=m | ||
| 349 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
| 262 | CONFIG_HFS_FS=m | 350 | CONFIG_HFS_FS=m |
| 263 | CONFIG_HFSPLUS_FS=m | 351 | CONFIG_HFSPLUS_FS=m |
| 264 | CONFIG_CRAMFS=m | 352 | CONFIG_CRAMFS=m |
| 265 | CONFIG_SQUASHFS=m | 353 | CONFIG_SQUASHFS=m |
| 266 | CONFIG_MINIX_FS=y | 354 | CONFIG_SQUASHFS_LZO=y |
| 355 | CONFIG_MINIX_FS=m | ||
| 356 | CONFIG_OMFS_FS=m | ||
| 267 | CONFIG_HPFS_FS=m | 357 | CONFIG_HPFS_FS=m |
| 358 | CONFIG_QNX4FS_FS=m | ||
| 359 | CONFIG_QNX6FS_FS=m | ||
| 268 | CONFIG_SYSV_FS=m | 360 | CONFIG_SYSV_FS=m |
| 269 | CONFIG_UFS_FS=m | 361 | CONFIG_UFS_FS=m |
| 270 | CONFIG_NFS_FS=y | 362 | CONFIG_NFS_FS=y |
| 271 | CONFIG_NFS_V3=y | ||
| 272 | CONFIG_NFS_V4=y | 363 | CONFIG_NFS_V4=y |
| 364 | CONFIG_NFS_SWAP=y | ||
| 365 | CONFIG_ROOT_NFS=y | ||
| 273 | CONFIG_NFSD=m | 366 | CONFIG_NFSD=m |
| 274 | CONFIG_NFSD_V3=y | 367 | CONFIG_NFSD_V3=y |
| 275 | CONFIG_SMB_FS=m | 368 | CONFIG_CIFS=m |
| 276 | CONFIG_SMB_NLS_DEFAULT=y | 369 | # CONFIG_CIFS_DEBUG is not set |
| 277 | CONFIG_CODA_FS=m | 370 | CONFIG_CODA_FS=m |
| 278 | CONFIG_NLS_CODEPAGE_437=y | 371 | CONFIG_NLS_CODEPAGE_437=y |
| 279 | CONFIG_NLS_CODEPAGE_737=m | 372 | CONFIG_NLS_CODEPAGE_737=m |
| @@ -312,10 +405,23 @@ CONFIG_NLS_ISO8859_14=m | |||
| 312 | CONFIG_NLS_ISO8859_15=m | 405 | CONFIG_NLS_ISO8859_15=m |
| 313 | CONFIG_NLS_KOI8_R=m | 406 | CONFIG_NLS_KOI8_R=m |
| 314 | CONFIG_NLS_KOI8_U=m | 407 | CONFIG_NLS_KOI8_U=m |
| 408 | CONFIG_NLS_MAC_ROMAN=m | ||
| 409 | CONFIG_NLS_MAC_CELTIC=m | ||
| 410 | CONFIG_NLS_MAC_CENTEURO=m | ||
| 411 | CONFIG_NLS_MAC_CROATIAN=m | ||
| 412 | CONFIG_NLS_MAC_CYRILLIC=m | ||
| 413 | CONFIG_NLS_MAC_GAELIC=m | ||
| 414 | CONFIG_NLS_MAC_GREEK=m | ||
| 415 | CONFIG_NLS_MAC_ICELAND=m | ||
| 416 | CONFIG_NLS_MAC_INUIT=m | ||
| 417 | CONFIG_NLS_MAC_ROMANIAN=m | ||
| 418 | CONFIG_NLS_MAC_TURKISH=m | ||
| 315 | CONFIG_DLM=m | 419 | CONFIG_DLM=m |
| 316 | CONFIG_MAGIC_SYSRQ=y | 420 | CONFIG_MAGIC_SYSRQ=y |
| 317 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 421 | CONFIG_ASYNC_RAID6_TEST=m |
| 318 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 422 | CONFIG_ENCRYPTED_KEYS=m |
| 423 | CONFIG_CRYPTO_MANAGER=y | ||
| 424 | CONFIG_CRYPTO_USER=m | ||
| 319 | CONFIG_CRYPTO_NULL=m | 425 | CONFIG_CRYPTO_NULL=m |
| 320 | CONFIG_CRYPTO_CRYPTD=m | 426 | CONFIG_CRYPTO_CRYPTD=m |
| 321 | CONFIG_CRYPTO_TEST=m | 427 | CONFIG_CRYPTO_TEST=m |
| @@ -325,19 +431,16 @@ CONFIG_CRYPTO_CTS=m | |||
| 325 | CONFIG_CRYPTO_LRW=m | 431 | CONFIG_CRYPTO_LRW=m |
| 326 | CONFIG_CRYPTO_PCBC=m | 432 | CONFIG_CRYPTO_PCBC=m |
| 327 | CONFIG_CRYPTO_XTS=m | 433 | CONFIG_CRYPTO_XTS=m |
| 328 | CONFIG_CRYPTO_HMAC=y | ||
| 329 | CONFIG_CRYPTO_XCBC=m | 434 | CONFIG_CRYPTO_XCBC=m |
| 330 | CONFIG_CRYPTO_MD4=m | 435 | CONFIG_CRYPTO_VMAC=m |
| 331 | CONFIG_CRYPTO_MICHAEL_MIC=m | 436 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 332 | CONFIG_CRYPTO_RMD128=m | 437 | CONFIG_CRYPTO_RMD128=m |
| 333 | CONFIG_CRYPTO_RMD160=m | 438 | CONFIG_CRYPTO_RMD160=m |
| 334 | CONFIG_CRYPTO_RMD256=m | 439 | CONFIG_CRYPTO_RMD256=m |
| 335 | CONFIG_CRYPTO_RMD320=m | 440 | CONFIG_CRYPTO_RMD320=m |
| 336 | CONFIG_CRYPTO_SHA256=m | ||
| 337 | CONFIG_CRYPTO_SHA512=m | 441 | CONFIG_CRYPTO_SHA512=m |
| 338 | CONFIG_CRYPTO_TGR192=m | 442 | CONFIG_CRYPTO_TGR192=m |
| 339 | CONFIG_CRYPTO_WP512=m | 443 | CONFIG_CRYPTO_WP512=m |
| 340 | CONFIG_CRYPTO_AES=m | ||
| 341 | CONFIG_CRYPTO_ANUBIS=m | 444 | CONFIG_CRYPTO_ANUBIS=m |
| 342 | CONFIG_CRYPTO_BLOWFISH=m | 445 | CONFIG_CRYPTO_BLOWFISH=m |
| 343 | CONFIG_CRYPTO_CAMELLIA=m | 446 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -353,6 +456,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
| 353 | CONFIG_CRYPTO_ZLIB=m | 456 | CONFIG_CRYPTO_ZLIB=m |
| 354 | CONFIG_CRYPTO_LZO=m | 457 | CONFIG_CRYPTO_LZO=m |
| 355 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 458 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 459 | CONFIG_CRYPTO_USER_API_HASH=m | ||
| 460 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
| 356 | # CONFIG_CRYPTO_HW is not set | 461 | # CONFIG_CRYPTO_HW is not set |
| 357 | CONFIG_CRC16=y | ||
| 358 | CONFIG_CRC_T10DIF=y | 462 | CONFIG_CRC_T10DIF=y |
| 463 | CONFIG_XZ_DEC_X86=y | ||
| 464 | CONFIG_XZ_DEC_POWERPC=y | ||
| 465 | CONFIG_XZ_DEC_IA64=y | ||
| 466 | CONFIG_XZ_DEC_ARM=y | ||
| 467 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
| 468 | CONFIG_XZ_DEC_SPARC=y | ||
| 469 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index 12f211733ba0..c015ddb6fd80 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig | |||
| @@ -1,53 +1,74 @@ | |||
| 1 | CONFIG_EXPERIMENTAL=y | ||
| 2 | CONFIG_LOCALVERSION="-bvme6000" | 1 | CONFIG_LOCALVERSION="-bvme6000" |
| 3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
| 4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
| 4 | CONFIG_FHANDLE=y | ||
| 5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
| 6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
| 7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
| 8 | # CONFIG_UTS_NS is not set | ||
| 9 | # CONFIG_IPC_NS is not set | ||
| 10 | # CONFIG_PID_NS is not set | ||
| 11 | # CONFIG_NET_NS is not set | ||
| 8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
| 9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
| 11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
| 12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
| 13 | CONFIG_VME=y | 16 | CONFIG_PARTITION_ADVANCED=y |
| 14 | CONFIG_BVME6000=y | 17 | CONFIG_AMIGA_PARTITION=y |
| 18 | CONFIG_ATARI_PARTITION=y | ||
| 19 | CONFIG_MAC_PARTITION=y | ||
| 20 | CONFIG_BSD_DISKLABEL=y | ||
| 21 | CONFIG_MINIX_SUBPARTITION=y | ||
| 22 | CONFIG_SOLARIS_X86_PARTITION=y | ||
| 23 | CONFIG_UNIXWARE_DISKLABEL=y | ||
| 24 | CONFIG_SUN_PARTITION=y | ||
| 25 | # CONFIG_EFI_PARTITION is not set | ||
| 26 | CONFIG_IOSCHED_DEADLINE=m | ||
| 15 | CONFIG_M68040=y | 27 | CONFIG_M68040=y |
| 16 | CONFIG_M68060=y | 28 | CONFIG_M68060=y |
| 29 | CONFIG_VME=y | ||
| 30 | CONFIG_BVME6000=y | ||
| 31 | # CONFIG_COMPACTION is not set | ||
| 32 | CONFIG_CLEANCACHE=y | ||
| 33 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 17 | CONFIG_BINFMT_AOUT=m | 34 | CONFIG_BINFMT_AOUT=m |
| 18 | CONFIG_BINFMT_MISC=m | 35 | CONFIG_BINFMT_MISC=m |
| 19 | CONFIG_PROC_HARDWARE=y | ||
| 20 | CONFIG_NET=y | 36 | CONFIG_NET=y |
| 21 | CONFIG_PACKET=y | 37 | CONFIG_PACKET=y |
| 38 | CONFIG_PACKET_DIAG=m | ||
| 22 | CONFIG_UNIX=y | 39 | CONFIG_UNIX=y |
| 40 | CONFIG_UNIX_DIAG=m | ||
| 41 | CONFIG_XFRM_MIGRATE=y | ||
| 23 | CONFIG_NET_KEY=y | 42 | CONFIG_NET_KEY=y |
| 24 | CONFIG_NET_KEY_MIGRATE=y | ||
| 25 | CONFIG_INET=y | 43 | CONFIG_INET=y |
| 26 | CONFIG_IP_PNP=y | 44 | CONFIG_IP_PNP=y |
| 27 | CONFIG_IP_PNP_DHCP=y | 45 | CONFIG_IP_PNP_DHCP=y |
| 28 | CONFIG_IP_PNP_BOOTP=y | 46 | CONFIG_IP_PNP_BOOTP=y |
| 29 | CONFIG_IP_PNP_RARP=y | 47 | CONFIG_IP_PNP_RARP=y |
| 30 | CONFIG_NET_IPIP=m | 48 | CONFIG_NET_IPIP=m |
| 49 | CONFIG_NET_IPGRE_DEMUX=m | ||
| 31 | CONFIG_NET_IPGRE=m | 50 | CONFIG_NET_IPGRE=m |
| 32 | CONFIG_SYN_COOKIES=y | 51 | CONFIG_SYN_COOKIES=y |
| 52 | CONFIG_NET_IPVTI=m | ||
| 33 | CONFIG_INET_AH=m | 53 | CONFIG_INET_AH=m |
| 34 | CONFIG_INET_ESP=m | 54 | CONFIG_INET_ESP=m |
| 35 | CONFIG_INET_IPCOMP=m | 55 | CONFIG_INET_IPCOMP=m |
| 36 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 56 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 37 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 57 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 38 | CONFIG_INET_XFRM_MODE_BEET=m | 58 | CONFIG_INET_XFRM_MODE_BEET=m |
| 59 | # CONFIG_INET_LRO is not set | ||
| 39 | CONFIG_INET_DIAG=m | 60 | CONFIG_INET_DIAG=m |
| 61 | CONFIG_INET_UDP_DIAG=m | ||
| 40 | CONFIG_IPV6_PRIVACY=y | 62 | CONFIG_IPV6_PRIVACY=y |
| 41 | CONFIG_IPV6_ROUTER_PREF=y | 63 | CONFIG_IPV6_ROUTER_PREF=y |
| 42 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 43 | CONFIG_INET6_AH=m | 64 | CONFIG_INET6_AH=m |
| 44 | CONFIG_INET6_ESP=m | 65 | CONFIG_INET6_ESP=m |
| 45 | CONFIG_INET6_IPCOMP=m | 66 | CONFIG_INET6_IPCOMP=m |
| 46 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 67 | CONFIG_IPV6_GRE=m |
| 47 | CONFIG_IPV6_TUNNEL=m | ||
| 48 | CONFIG_NETFILTER=y | 68 | CONFIG_NETFILTER=y |
| 49 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
| 50 | CONFIG_NF_CONNTRACK=m | 69 | CONFIG_NF_CONNTRACK=m |
| 70 | CONFIG_NF_CONNTRACK_ZONES=y | ||
| 71 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
| 51 | # CONFIG_NF_CT_PROTO_DCCP is not set | 72 | # CONFIG_NF_CT_PROTO_DCCP is not set |
| 52 | CONFIG_NF_CT_PROTO_UDPLITE=m | 73 | CONFIG_NF_CT_PROTO_UDPLITE=m |
| 53 | CONFIG_NF_CONNTRACK_AMANDA=m | 74 | CONFIG_NF_CONNTRACK_AMANDA=m |
| @@ -55,25 +76,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
| 55 | CONFIG_NF_CONNTRACK_H323=m | 76 | CONFIG_NF_CONNTRACK_H323=m |
| 56 | CONFIG_NF_CONNTRACK_IRC=m | 77 | CONFIG_NF_CONNTRACK_IRC=m |
| 57 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 78 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
| 79 | CONFIG_NF_CONNTRACK_SNMP=m | ||
| 58 | CONFIG_NF_CONNTRACK_PPTP=m | 80 | CONFIG_NF_CONNTRACK_PPTP=m |
| 59 | CONFIG_NF_CONNTRACK_SANE=m | 81 | CONFIG_NF_CONNTRACK_SANE=m |
| 60 | CONFIG_NF_CONNTRACK_SIP=m | 82 | CONFIG_NF_CONNTRACK_SIP=m |
| 61 | CONFIG_NF_CONNTRACK_TFTP=m | 83 | CONFIG_NF_CONNTRACK_TFTP=m |
| 84 | CONFIG_NETFILTER_XT_SET=m | ||
| 85 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
| 62 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 86 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 63 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 87 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 64 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 88 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 89 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
| 90 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
| 91 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
| 65 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 92 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 66 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 93 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 67 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 94 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 95 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
| 96 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
| 68 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 97 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 69 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 98 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 70 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 99 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 100 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
| 101 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
| 71 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 102 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
| 72 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 103 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 73 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 104 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 105 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
| 74 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 106 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| 75 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 107 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 76 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 108 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 109 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
| 77 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 110 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 78 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 111 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 79 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 112 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| @@ -84,6 +117,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
| 84 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 117 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 85 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 118 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 86 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 119 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
| 120 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
| 121 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
| 87 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 122 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 88 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 123 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 89 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 124 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| @@ -97,22 +132,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 97 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 132 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 98 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 133 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 99 | CONFIG_NETFILTER_XT_MATCH_U32=m | 134 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 135 | CONFIG_IP_SET=m | ||
| 136 | CONFIG_IP_SET_BITMAP_IP=m | ||
| 137 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
| 138 | CONFIG_IP_SET_BITMAP_PORT=m | ||
| 139 | CONFIG_IP_SET_HASH_IP=m | ||
| 140 | CONFIG_IP_SET_HASH_IPPORT=m | ||
| 141 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
| 142 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
| 143 | CONFIG_IP_SET_HASH_NET=m | ||
| 144 | CONFIG_IP_SET_HASH_NETPORT=m | ||
| 145 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
| 146 | CONFIG_IP_SET_LIST_SET=m | ||
| 100 | CONFIG_NF_CONNTRACK_IPV4=m | 147 | CONFIG_NF_CONNTRACK_IPV4=m |
| 101 | CONFIG_IP_NF_QUEUE=m | ||
| 102 | CONFIG_IP_NF_IPTABLES=m | 148 | CONFIG_IP_NF_IPTABLES=m |
| 103 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 104 | CONFIG_IP_NF_MATCH_AH=m | 149 | CONFIG_IP_NF_MATCH_AH=m |
| 105 | CONFIG_IP_NF_MATCH_ECN=m | 150 | CONFIG_IP_NF_MATCH_ECN=m |
| 151 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
| 106 | CONFIG_IP_NF_MATCH_TTL=m | 152 | CONFIG_IP_NF_MATCH_TTL=m |
| 107 | CONFIG_IP_NF_FILTER=m | 153 | CONFIG_IP_NF_FILTER=m |
| 108 | CONFIG_IP_NF_TARGET_REJECT=m | 154 | CONFIG_IP_NF_TARGET_REJECT=m |
| 109 | CONFIG_IP_NF_TARGET_LOG=m | ||
| 110 | CONFIG_IP_NF_TARGET_ULOG=m | 155 | CONFIG_IP_NF_TARGET_ULOG=m |
| 111 | CONFIG_NF_NAT=m | 156 | CONFIG_NF_NAT_IPV4=m |
| 112 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 157 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 113 | CONFIG_IP_NF_TARGET_NETMAP=m | 158 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 114 | CONFIG_IP_NF_TARGET_REDIRECT=m | 159 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 115 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
| 116 | CONFIG_IP_NF_MANGLE=m | 160 | CONFIG_IP_NF_MANGLE=m |
| 117 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 161 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
| 118 | CONFIG_IP_NF_TARGET_ECN=m | 162 | CONFIG_IP_NF_TARGET_ECN=m |
| @@ -122,7 +166,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
| 122 | CONFIG_IP_NF_ARPFILTER=m | 166 | CONFIG_IP_NF_ARPFILTER=m |
| 123 | CONFIG_IP_NF_ARP_MANGLE=m | 167 | CONFIG_IP_NF_ARP_MANGLE=m |
| 124 | CONFIG_NF_CONNTRACK_IPV6=m | 168 | CONFIG_NF_CONNTRACK_IPV6=m |
| 125 | CONFIG_IP6_NF_QUEUE=m | ||
| 126 | CONFIG_IP6_NF_IPTABLES=m | 169 | CONFIG_IP6_NF_IPTABLES=m |
| 127 | CONFIG_IP6_NF_MATCH_AH=m | 170 | CONFIG_IP6_NF_MATCH_AH=m |
| 128 | CONFIG_IP6_NF_MATCH_EUI64=m | 171 | CONFIG_IP6_NF_MATCH_EUI64=m |
| @@ -131,21 +174,34 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
| 131 | CONFIG_IP6_NF_MATCH_HL=m | 174 | CONFIG_IP6_NF_MATCH_HL=m |
| 132 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 175 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 133 | CONFIG_IP6_NF_MATCH_MH=m | 176 | CONFIG_IP6_NF_MATCH_MH=m |
| 177 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
| 134 | CONFIG_IP6_NF_MATCH_RT=m | 178 | CONFIG_IP6_NF_MATCH_RT=m |
| 135 | CONFIG_IP6_NF_TARGET_HL=m | 179 | CONFIG_IP6_NF_TARGET_HL=m |
| 136 | CONFIG_IP6_NF_TARGET_LOG=m | ||
| 137 | CONFIG_IP6_NF_FILTER=m | 180 | CONFIG_IP6_NF_FILTER=m |
| 138 | CONFIG_IP6_NF_TARGET_REJECT=m | 181 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 139 | CONFIG_IP6_NF_MANGLE=m | 182 | CONFIG_IP6_NF_MANGLE=m |
| 140 | CONFIG_IP6_NF_RAW=m | 183 | CONFIG_IP6_NF_RAW=m |
| 184 | CONFIG_NF_NAT_IPV6=m | ||
| 185 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
| 186 | CONFIG_IP6_NF_TARGET_NPT=m | ||
| 141 | CONFIG_IP_DCCP=m | 187 | CONFIG_IP_DCCP=m |
| 142 | # CONFIG_IP_DCCP_CCID3 is not set | 188 | # CONFIG_IP_DCCP_CCID3 is not set |
| 189 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
| 190 | CONFIG_RDS=m | ||
| 191 | CONFIG_RDS_TCP=m | ||
| 192 | CONFIG_L2TP=m | ||
| 143 | CONFIG_ATALK=m | 193 | CONFIG_ATALK=m |
| 194 | CONFIG_BATMAN_ADV=m | ||
| 195 | CONFIG_BATMAN_ADV_DAT=y | ||
| 196 | # CONFIG_WIRELESS is not set | ||
| 144 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 197 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 198 | CONFIG_DEVTMPFS=y | ||
| 145 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 199 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
| 200 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
| 146 | CONFIG_CONNECTOR=m | 201 | CONFIG_CONNECTOR=m |
| 147 | CONFIG_BLK_DEV_LOOP=y | 202 | CONFIG_BLK_DEV_LOOP=y |
| 148 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 203 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
| 204 | CONFIG_BLK_DEV_DRBD=m | ||
| 149 | CONFIG_BLK_DEV_NBD=m | 205 | CONFIG_BLK_DEV_NBD=m |
| 150 | CONFIG_BLK_DEV_RAM=y | 206 | CONFIG_BLK_DEV_RAM=y |
| 151 | CONFIG_CDROM_PKTCDVD=m | 207 | CONFIG_CDROM_PKTCDVD=m |
| @@ -160,103 +216,131 @@ CONFIG_BLK_DEV_SR=y | |||
| 160 | CONFIG_BLK_DEV_SR_VENDOR=y | 216 | CONFIG_BLK_DEV_SR_VENDOR=y |
| 161 | CONFIG_CHR_DEV_SG=m | 217 | CONFIG_CHR_DEV_SG=m |
| 162 | CONFIG_SCSI_CONSTANTS=y | 218 | CONFIG_SCSI_CONSTANTS=y |
| 163 | CONFIG_SCSI_SAS_LIBSAS=m | 219 | CONFIG_SCSI_SAS_ATTRS=m |
| 164 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
| 165 | CONFIG_SCSI_SRP_ATTRS=m | ||
| 166 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
| 167 | CONFIG_ISCSI_TCP=m | 220 | CONFIG_ISCSI_TCP=m |
| 221 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
| 168 | CONFIG_BVME6000_SCSI=y | 222 | CONFIG_BVME6000_SCSI=y |
| 169 | CONFIG_MD=y | 223 | CONFIG_MD=y |
| 170 | CONFIG_BLK_DEV_MD=m | ||
| 171 | CONFIG_MD_LINEAR=m | 224 | CONFIG_MD_LINEAR=m |
| 172 | CONFIG_MD_RAID0=m | 225 | CONFIG_MD_RAID0=m |
| 173 | CONFIG_MD_RAID1=m | ||
| 174 | CONFIG_MD_RAID456=m | ||
| 175 | CONFIG_BLK_DEV_DM=m | 226 | CONFIG_BLK_DEV_DM=m |
| 176 | CONFIG_DM_CRYPT=m | 227 | CONFIG_DM_CRYPT=m |
| 177 | CONFIG_DM_SNAPSHOT=m | 228 | CONFIG_DM_SNAPSHOT=m |
| 229 | CONFIG_DM_THIN_PROVISIONING=m | ||
| 230 | CONFIG_DM_CACHE=m | ||
| 178 | CONFIG_DM_MIRROR=m | 231 | CONFIG_DM_MIRROR=m |
| 232 | CONFIG_DM_RAID=m | ||
| 179 | CONFIG_DM_ZERO=m | 233 | CONFIG_DM_ZERO=m |
| 180 | CONFIG_DM_MULTIPATH=m | 234 | CONFIG_DM_MULTIPATH=m |
| 181 | CONFIG_DM_UEVENT=y | 235 | CONFIG_DM_UEVENT=y |
| 236 | CONFIG_TARGET_CORE=m | ||
| 237 | CONFIG_TCM_IBLOCK=m | ||
| 238 | CONFIG_TCM_FILEIO=m | ||
| 239 | CONFIG_TCM_PSCSI=m | ||
| 182 | CONFIG_NETDEVICES=y | 240 | CONFIG_NETDEVICES=y |
| 183 | CONFIG_DUMMY=m | 241 | CONFIG_DUMMY=m |
| 184 | CONFIG_MACVLAN=m | ||
| 185 | CONFIG_EQUALIZER=m | 242 | CONFIG_EQUALIZER=m |
| 243 | CONFIG_NET_TEAM=m | ||
| 244 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
| 245 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
| 246 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
| 247 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
| 248 | CONFIG_VXLAN=m | ||
| 249 | CONFIG_NETCONSOLE=m | ||
| 250 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
| 186 | CONFIG_VETH=m | 251 | CONFIG_VETH=m |
| 187 | CONFIG_NET_ETHERNET=y | 252 | # CONFIG_NET_CADENCE is not set |
| 253 | # CONFIG_NET_VENDOR_BROADCOM is not set | ||
| 188 | CONFIG_BVME6000_NET=y | 254 | CONFIG_BVME6000_NET=y |
| 189 | # CONFIG_NETDEV_1000 is not set | 255 | # CONFIG_NET_VENDOR_MARVELL is not set |
| 190 | # CONFIG_NETDEV_10000 is not set | 256 | # CONFIG_NET_VENDOR_MICREL is not set |
| 257 | # CONFIG_NET_VENDOR_NATSEMI is not set | ||
| 258 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
| 259 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
| 260 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
| 191 | CONFIG_PPP=m | 261 | CONFIG_PPP=m |
| 192 | CONFIG_PPP_FILTER=y | ||
| 193 | CONFIG_PPP_ASYNC=m | ||
| 194 | CONFIG_PPP_SYNC_TTY=m | ||
| 195 | CONFIG_PPP_DEFLATE=m | ||
| 196 | CONFIG_PPP_BSDCOMP=m | 262 | CONFIG_PPP_BSDCOMP=m |
| 263 | CONFIG_PPP_DEFLATE=m | ||
| 264 | CONFIG_PPP_FILTER=y | ||
| 197 | CONFIG_PPP_MPPE=m | 265 | CONFIG_PPP_MPPE=m |
| 198 | CONFIG_PPPOE=m | 266 | CONFIG_PPPOE=m |
| 267 | CONFIG_PPTP=m | ||
| 268 | CONFIG_PPPOL2TP=m | ||
| 269 | CONFIG_PPP_ASYNC=m | ||
| 270 | CONFIG_PPP_SYNC_TTY=m | ||
| 199 | CONFIG_SLIP=m | 271 | CONFIG_SLIP=m |
| 200 | CONFIG_SLIP_COMPRESSED=y | 272 | CONFIG_SLIP_COMPRESSED=y |
| 201 | CONFIG_SLIP_SMART=y | 273 | CONFIG_SLIP_SMART=y |
| 202 | CONFIG_SLIP_MODE_SLIP6=y | 274 | CONFIG_SLIP_MODE_SLIP6=y |
| 203 | CONFIG_NETCONSOLE=m | 275 | # CONFIG_WLAN is not set |
| 204 | CONFIG_NETCONSOLE_DYNAMIC=y | 276 | CONFIG_INPUT_EVDEV=m |
| 205 | CONFIG_INPUT_FF_MEMLESS=m | ||
| 206 | # CONFIG_KEYBOARD_ATKBD is not set | 277 | # CONFIG_KEYBOARD_ATKBD is not set |
| 207 | CONFIG_MOUSE_PS2=m | 278 | # CONFIG_MOUSE_PS2 is not set |
| 208 | CONFIG_MOUSE_SERIAL=m | 279 | # CONFIG_SERIO is not set |
| 209 | CONFIG_SERIO=m | ||
| 210 | # CONFIG_SERIO_SERPORT is not set | ||
| 211 | CONFIG_VT_HW_CONSOLE_BINDING=y | 280 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 281 | # CONFIG_LEGACY_PTYS is not set | ||
| 212 | # CONFIG_DEVKMEM is not set | 282 | # CONFIG_DEVKMEM is not set |
| 213 | # CONFIG_HW_RANDOM is not set | 283 | # CONFIG_HW_RANDOM is not set |
| 214 | CONFIG_GEN_RTC=m | 284 | CONFIG_NTP_PPS=y |
| 215 | CONFIG_GEN_RTC_X=y | 285 | CONFIG_PPS_CLIENT_LDISC=m |
| 286 | CONFIG_PTP_1588_CLOCK=m | ||
| 216 | # CONFIG_HWMON is not set | 287 | # CONFIG_HWMON is not set |
| 217 | CONFIG_HID=m | 288 | CONFIG_HID=m |
| 218 | CONFIG_HIDRAW=y | 289 | CONFIG_HIDRAW=y |
| 290 | CONFIG_UHID=m | ||
| 291 | # CONFIG_HID_GENERIC is not set | ||
| 219 | # CONFIG_USB_SUPPORT is not set | 292 | # CONFIG_USB_SUPPORT is not set |
| 293 | CONFIG_RTC_CLASS=y | ||
| 294 | CONFIG_RTC_DRV_GENERIC=m | ||
| 295 | # CONFIG_IOMMU_SUPPORT is not set | ||
| 296 | CONFIG_PROC_HARDWARE=y | ||
| 220 | CONFIG_EXT2_FS=y | 297 | CONFIG_EXT2_FS=y |
| 221 | CONFIG_EXT3_FS=y | 298 | CONFIG_EXT3_FS=y |
| 222 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 299 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
| 223 | # CONFIG_EXT3_FS_XATTR is not set | 300 | # CONFIG_EXT3_FS_XATTR is not set |
| 301 | CONFIG_EXT4_FS=y | ||
| 224 | CONFIG_REISERFS_FS=m | 302 | CONFIG_REISERFS_FS=m |
| 225 | CONFIG_JFS_FS=m | 303 | CONFIG_JFS_FS=m |
| 226 | CONFIG_XFS_FS=m | 304 | CONFIG_XFS_FS=m |
| 227 | CONFIG_OCFS2_FS=m | 305 | CONFIG_OCFS2_FS=m |
| 228 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 229 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 306 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 307 | CONFIG_FANOTIFY=y | ||
| 230 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 308 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 231 | # CONFIG_PRINT_QUOTA_WARNING is not set | 309 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 232 | CONFIG_AUTOFS_FS=m | ||
| 233 | CONFIG_AUTOFS4_FS=m | 310 | CONFIG_AUTOFS4_FS=m |
| 234 | CONFIG_FUSE_FS=m | 311 | CONFIG_FUSE_FS=m |
| 312 | CONFIG_CUSE=m | ||
| 235 | CONFIG_ISO9660_FS=y | 313 | CONFIG_ISO9660_FS=y |
| 236 | CONFIG_JOLIET=y | 314 | CONFIG_JOLIET=y |
| 237 | CONFIG_ZISOFS=y | 315 | CONFIG_ZISOFS=y |
| 238 | CONFIG_UDF_FS=m | 316 | CONFIG_UDF_FS=m |
| 239 | CONFIG_MSDOS_FS=y | 317 | CONFIG_MSDOS_FS=m |
| 240 | CONFIG_VFAT_FS=m | 318 | CONFIG_VFAT_FS=m |
| 241 | CONFIG_PROC_KCORE=y | 319 | CONFIG_PROC_KCORE=y |
| 242 | CONFIG_TMPFS=y | 320 | CONFIG_TMPFS=y |
| 243 | CONFIG_AFFS_FS=m | 321 | CONFIG_AFFS_FS=m |
| 322 | CONFIG_ECRYPT_FS=m | ||
| 323 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
| 244 | CONFIG_HFS_FS=m | 324 | CONFIG_HFS_FS=m |
| 245 | CONFIG_HFSPLUS_FS=m | 325 | CONFIG_HFSPLUS_FS=m |
| 246 | CONFIG_CRAMFS=m | 326 | CONFIG_CRAMFS=m |
| 247 | CONFIG_SQUASHFS=m | 327 | CONFIG_SQUASHFS=m |
| 248 | CONFIG_MINIX_FS=y | 328 | CONFIG_SQUASHFS_LZO=y |
| 329 | CONFIG_MINIX_FS=m | ||
| 330 | CONFIG_OMFS_FS=m | ||
| 249 | CONFIG_HPFS_FS=m | 331 | CONFIG_HPFS_FS=m |
| 332 | CONFIG_QNX4FS_FS=m | ||
| 333 | CONFIG_QNX6FS_FS=m | ||
| 250 | CONFIG_SYSV_FS=m | 334 | CONFIG_SYSV_FS=m |
| 251 | CONFIG_UFS_FS=m | 335 | CONFIG_UFS_FS=m |
| 252 | CONFIG_NFS_FS=y | 336 | CONFIG_NFS_FS=y |
| 253 | CONFIG_NFS_V3=y | ||
| 254 | CONFIG_NFS_V4=y | 337 | CONFIG_NFS_V4=y |
| 338 | CONFIG_NFS_SWAP=y | ||
| 255 | CONFIG_ROOT_NFS=y | 339 | CONFIG_ROOT_NFS=y |
| 256 | CONFIG_NFSD=m | 340 | CONFIG_NFSD=m |
| 257 | CONFIG_NFSD_V3=y | 341 | CONFIG_NFSD_V3=y |
| 258 | CONFIG_SMB_FS=m | 342 | CONFIG_CIFS=m |
| 259 | CONFIG_SMB_NLS_DEFAULT=y | 343 | # CONFIG_CIFS_DEBUG is not set |
| 260 | CONFIG_CODA_FS=m | 344 | CONFIG_CODA_FS=m |
| 261 | CONFIG_NLS_CODEPAGE_437=y | 345 | CONFIG_NLS_CODEPAGE_437=y |
| 262 | CONFIG_NLS_CODEPAGE_737=m | 346 | CONFIG_NLS_CODEPAGE_737=m |
| @@ -295,10 +379,23 @@ CONFIG_NLS_ISO8859_14=m | |||
| 295 | CONFIG_NLS_ISO8859_15=m | 379 | CONFIG_NLS_ISO8859_15=m |
| 296 | CONFIG_NLS_KOI8_R=m | 380 | CONFIG_NLS_KOI8_R=m |
| 297 | CONFIG_NLS_KOI8_U=m | 381 | CONFIG_NLS_KOI8_U=m |
| 382 | CONFIG_NLS_MAC_ROMAN=m | ||
| 383 | CONFIG_NLS_MAC_CELTIC=m | ||
| 384 | CONFIG_NLS_MAC_CENTEURO=m | ||
| 385 | CONFIG_NLS_MAC_CROATIAN=m | ||
| 386 | CONFIG_NLS_MAC_CYRILLIC=m | ||
| 387 | CONFIG_NLS_MAC_GAELIC=m | ||
| 388 | CONFIG_NLS_MAC_GREEK=m | ||
| 389 | CONFIG_NLS_MAC_ICELAND=m | ||
| 390 | CONFIG_NLS_MAC_INUIT=m | ||
| 391 | CONFIG_NLS_MAC_ROMANIAN=m | ||
| 392 | CONFIG_NLS_MAC_TURKISH=m | ||
| 298 | CONFIG_DLM=m | 393 | CONFIG_DLM=m |
| 299 | CONFIG_MAGIC_SYSRQ=y | 394 | CONFIG_MAGIC_SYSRQ=y |
| 300 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 395 | CONFIG_ASYNC_RAID6_TEST=m |
| 301 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 396 | CONFIG_ENCRYPTED_KEYS=m |
| 397 | CONFIG_CRYPTO_MANAGER=y | ||
| 398 | CONFIG_CRYPTO_USER=m | ||
| 302 | CONFIG_CRYPTO_NULL=m | 399 | CONFIG_CRYPTO_NULL=m |
| 303 | CONFIG_CRYPTO_CRYPTD=m | 400 | CONFIG_CRYPTO_CRYPTD=m |
| 304 | CONFIG_CRYPTO_TEST=m | 401 | CONFIG_CRYPTO_TEST=m |
| @@ -308,19 +405,16 @@ CONFIG_CRYPTO_CTS=m | |||
| 308 | CONFIG_CRYPTO_LRW=m | 405 | CONFIG_CRYPTO_LRW=m |
| 309 | CONFIG_CRYPTO_PCBC=m | 406 | CONFIG_CRYPTO_PCBC=m |
| 310 | CONFIG_CRYPTO_XTS=m | 407 | CONFIG_CRYPTO_XTS=m |
| 311 | CONFIG_CRYPTO_HMAC=y | ||
| 312 | CONFIG_CRYPTO_XCBC=m | 408 | CONFIG_CRYPTO_XCBC=m |
| 313 | CONFIG_CRYPTO_MD4=m | 409 | CONFIG_CRYPTO_VMAC=m |
| 314 | CONFIG_CRYPTO_MICHAEL_MIC=m | 410 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 315 | CONFIG_CRYPTO_RMD128=m | 411 | CONFIG_CRYPTO_RMD128=m |
| 316 | CONFIG_CRYPTO_RMD160=m | 412 | CONFIG_CRYPTO_RMD160=m |
| 317 | CONFIG_CRYPTO_RMD256=m | 413 | CONFIG_CRYPTO_RMD256=m |
| 318 | CONFIG_CRYPTO_RMD320=m | 414 | CONFIG_CRYPTO_RMD320=m |
| 319 | CONFIG_CRYPTO_SHA256=m | ||
| 320 | CONFIG_CRYPTO_SHA512=m | 415 | CONFIG_CRYPTO_SHA512=m |
| 321 | CONFIG_CRYPTO_TGR192=m | 416 | CONFIG_CRYPTO_TGR192=m |
| 322 | CONFIG_CRYPTO_WP512=m | 417 | CONFIG_CRYPTO_WP512=m |
| 323 | CONFIG_CRYPTO_AES=m | ||
| 324 | CONFIG_CRYPTO_ANUBIS=m | 418 | CONFIG_CRYPTO_ANUBIS=m |
| 325 | CONFIG_CRYPTO_BLOWFISH=m | 419 | CONFIG_CRYPTO_BLOWFISH=m |
| 326 | CONFIG_CRYPTO_CAMELLIA=m | 420 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -336,7 +430,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
| 336 | CONFIG_CRYPTO_ZLIB=m | 430 | CONFIG_CRYPTO_ZLIB=m |
| 337 | CONFIG_CRYPTO_LZO=m | 431 | CONFIG_CRYPTO_LZO=m |
| 338 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 432 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 433 | CONFIG_CRYPTO_USER_API_HASH=m | ||
| 434 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
| 339 | # CONFIG_CRYPTO_HW is not set | 435 | # CONFIG_CRYPTO_HW is not set |
| 340 | CONFIG_CRC16=m | ||
| 341 | CONFIG_CRC_T10DIF=y | 436 | CONFIG_CRC_T10DIF=y |
| 342 | CONFIG_CRC32=m | 437 | CONFIG_XZ_DEC_X86=y |
| 438 | CONFIG_XZ_DEC_POWERPC=y | ||
| 439 | CONFIG_XZ_DEC_IA64=y | ||
| 440 | CONFIG_XZ_DEC_ARM=y | ||
| 441 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
| 442 | CONFIG_XZ_DEC_SPARC=y | ||
| 443 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index 215389a5407f..ec7382d8afff 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig | |||
| @@ -1,54 +1,76 @@ | |||
| 1 | CONFIG_EXPERIMENTAL=y | ||
| 2 | CONFIG_LOCALVERSION="-hp300" | 1 | CONFIG_LOCALVERSION="-hp300" |
| 3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
| 4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
| 4 | CONFIG_FHANDLE=y | ||
| 5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
| 6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
| 7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
| 8 | # CONFIG_UTS_NS is not set | ||
| 9 | # CONFIG_IPC_NS is not set | ||
| 10 | # CONFIG_PID_NS is not set | ||
| 11 | # CONFIG_NET_NS is not set | ||
| 8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
| 9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
| 11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
| 12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
| 13 | CONFIG_HP300=y | 16 | CONFIG_PARTITION_ADVANCED=y |
| 17 | CONFIG_AMIGA_PARTITION=y | ||
| 18 | CONFIG_ATARI_PARTITION=y | ||
| 19 | CONFIG_MAC_PARTITION=y | ||
| 20 | CONFIG_BSD_DISKLABEL=y | ||
| 21 | CONFIG_MINIX_SUBPARTITION=y | ||
| 22 | CONFIG_SOLARIS_X86_PARTITION=y | ||
| 23 | CONFIG_UNIXWARE_DISKLABEL=y | ||
| 24 | CONFIG_SUN_PARTITION=y | ||
| 25 | # CONFIG_EFI_PARTITION is not set | ||
| 26 | CONFIG_SYSV68_PARTITION=y | ||
| 27 | CONFIG_IOSCHED_DEADLINE=m | ||
| 14 | CONFIG_M68020=y | 28 | CONFIG_M68020=y |
| 15 | CONFIG_M68030=y | 29 | CONFIG_M68030=y |
| 16 | CONFIG_M68040=y | 30 | CONFIG_M68040=y |
| 17 | CONFIG_M68060=y | 31 | CONFIG_M68060=y |
| 32 | CONFIG_HP300=y | ||
| 33 | # CONFIG_COMPACTION is not set | ||
| 34 | CONFIG_CLEANCACHE=y | ||
| 35 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 18 | CONFIG_BINFMT_AOUT=m | 36 | CONFIG_BINFMT_AOUT=m |
| 19 | CONFIG_BINFMT_MISC=m | 37 | CONFIG_BINFMT_MISC=m |
| 20 | CONFIG_PROC_HARDWARE=y | ||
| 21 | CONFIG_NET=y | 38 | CONFIG_NET=y |
| 22 | CONFIG_PACKET=y | 39 | CONFIG_PACKET=y |
| 40 | CONFIG_PACKET_DIAG=m | ||
| 23 | CONFIG_UNIX=y | 41 | CONFIG_UNIX=y |
| 42 | CONFIG_UNIX_DIAG=m | ||
| 43 | CONFIG_XFRM_MIGRATE=y | ||
| 24 | CONFIG_NET_KEY=y | 44 | CONFIG_NET_KEY=y |
| 25 | CONFIG_NET_KEY_MIGRATE=y | ||
| 26 | CONFIG_INET=y | 45 | CONFIG_INET=y |
| 27 | CONFIG_IP_PNP=y | 46 | CONFIG_IP_PNP=y |
| 28 | CONFIG_IP_PNP_DHCP=y | 47 | CONFIG_IP_PNP_DHCP=y |
| 29 | CONFIG_IP_PNP_BOOTP=y | 48 | CONFIG_IP_PNP_BOOTP=y |
| 30 | CONFIG_IP_PNP_RARP=y | 49 | CONFIG_IP_PNP_RARP=y |
| 31 | CONFIG_NET_IPIP=m | 50 | CONFIG_NET_IPIP=m |
| 51 | CONFIG_NET_IPGRE_DEMUX=m | ||
| 32 | CONFIG_NET_IPGRE=m | 52 | CONFIG_NET_IPGRE=m |
| 33 | CONFIG_SYN_COOKIES=y | 53 | CONFIG_SYN_COOKIES=y |
| 54 | CONFIG_NET_IPVTI=m | ||
| 34 | CONFIG_INET_AH=m | 55 | CONFIG_INET_AH=m |
| 35 | CONFIG_INET_ESP=m | 56 | CONFIG_INET_ESP=m |
| 36 | CONFIG_INET_IPCOMP=m | 57 | CONFIG_INET_IPCOMP=m |
| 37 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 58 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 38 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 59 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 39 | CONFIG_INET_XFRM_MODE_BEET=m | 60 | CONFIG_INET_XFRM_MODE_BEET=m |
| 61 | # CONFIG_INET_LRO is not set | ||
| 40 | CONFIG_INET_DIAG=m | 62 | CONFIG_INET_DIAG=m |
| 63 | CONFIG_INET_UDP_DIAG=m | ||
| 41 | CONFIG_IPV6_PRIVACY=y | 64 | CONFIG_IPV6_PRIVACY=y |
| 42 | CONFIG_IPV6_ROUTER_PREF=y | 65 | CONFIG_IPV6_ROUTER_PREF=y |
| 43 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 44 | CONFIG_INET6_AH=m | 66 | CONFIG_INET6_AH=m |
| 45 | CONFIG_INET6_ESP=m | 67 | CONFIG_INET6_ESP=m |
| 46 | CONFIG_INET6_IPCOMP=m | 68 | CONFIG_INET6_IPCOMP=m |
| 47 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 69 | CONFIG_IPV6_GRE=m |
| 48 | CONFIG_IPV6_TUNNEL=m | ||
| 49 | CONFIG_NETFILTER=y | 70 | CONFIG_NETFILTER=y |
| 50 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
| 51 | CONFIG_NF_CONNTRACK=m | 71 | CONFIG_NF_CONNTRACK=m |
| 72 | CONFIG_NF_CONNTRACK_ZONES=y | ||
| 73 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
| 52 | # CONFIG_NF_CT_PROTO_DCCP is not set | 74 | # CONFIG_NF_CT_PROTO_DCCP is not set |
| 53 | CONFIG_NF_CT_PROTO_UDPLITE=m | 75 | CONFIG_NF_CT_PROTO_UDPLITE=m |
| 54 | CONFIG_NF_CONNTRACK_AMANDA=m | 76 | CONFIG_NF_CONNTRACK_AMANDA=m |
| @@ -56,25 +78,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
| 56 | CONFIG_NF_CONNTRACK_H323=m | 78 | CONFIG_NF_CONNTRACK_H323=m |
| 57 | CONFIG_NF_CONNTRACK_IRC=m | 79 | CONFIG_NF_CONNTRACK_IRC=m |
| 58 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 80 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
| 81 | CONFIG_NF_CONNTRACK_SNMP=m | ||
| 59 | CONFIG_NF_CONNTRACK_PPTP=m | 82 | CONFIG_NF_CONNTRACK_PPTP=m |
| 60 | CONFIG_NF_CONNTRACK_SANE=m | 83 | CONFIG_NF_CONNTRACK_SANE=m |
| 61 | CONFIG_NF_CONNTRACK_SIP=m | 84 | CONFIG_NF_CONNTRACK_SIP=m |
| 62 | CONFIG_NF_CONNTRACK_TFTP=m | 85 | CONFIG_NF_CONNTRACK_TFTP=m |
| 86 | CONFIG_NETFILTER_XT_SET=m | ||
| 87 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
| 63 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 88 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 64 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 89 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 65 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 90 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 91 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
| 92 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
| 93 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
| 66 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 94 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 67 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 95 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 68 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 96 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 97 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
| 98 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
| 69 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 99 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 70 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 100 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 71 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 101 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 102 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
| 103 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
| 72 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 104 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
| 73 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 105 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 74 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 106 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 107 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
| 75 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 108 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| 76 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 109 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 77 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 110 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 111 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
| 78 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 112 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 79 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 113 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 80 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 114 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| @@ -85,6 +119,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
| 85 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 119 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 86 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 120 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 87 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 121 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
| 122 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
| 123 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
| 88 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 124 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 89 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 125 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 90 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 126 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| @@ -98,22 +134,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 98 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 134 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 99 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 135 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 100 | CONFIG_NETFILTER_XT_MATCH_U32=m | 136 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 137 | CONFIG_IP_SET=m | ||
| 138 | CONFIG_IP_SET_BITMAP_IP=m | ||
| 139 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
| 140 | CONFIG_IP_SET_BITMAP_PORT=m | ||
| 141 | CONFIG_IP_SET_HASH_IP=m | ||
| 142 | CONFIG_IP_SET_HASH_IPPORT=m | ||
| 143 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
| 144 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
| 145 | CONFIG_IP_SET_HASH_NET=m | ||
| 146 | CONFIG_IP_SET_HASH_NETPORT=m | ||
| 147 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
| 148 | CONFIG_IP_SET_LIST_SET=m | ||
| 101 | CONFIG_NF_CONNTRACK_IPV4=m | 149 | CONFIG_NF_CONNTRACK_IPV4=m |
| 102 | CONFIG_IP_NF_QUEUE=m | ||
| 103 | CONFIG_IP_NF_IPTABLES=m | 150 | CONFIG_IP_NF_IPTABLES=m |
| 104 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 105 | CONFIG_IP_NF_MATCH_AH=m | 151 | CONFIG_IP_NF_MATCH_AH=m |
| 106 | CONFIG_IP_NF_MATCH_ECN=m | 152 | CONFIG_IP_NF_MATCH_ECN=m |
| 153 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
| 107 | CONFIG_IP_NF_MATCH_TTL=m | 154 | CONFIG_IP_NF_MATCH_TTL=m |
| 108 | CONFIG_IP_NF_FILTER=m | 155 | CONFIG_IP_NF_FILTER=m |
| 109 | CONFIG_IP_NF_TARGET_REJECT=m | 156 | CONFIG_IP_NF_TARGET_REJECT=m |
| 110 | CONFIG_IP_NF_TARGET_LOG=m | ||
| 111 | CONFIG_IP_NF_TARGET_ULOG=m | 157 | CONFIG_IP_NF_TARGET_ULOG=m |
| 112 | CONFIG_NF_NAT=m | 158 | CONFIG_NF_NAT_IPV4=m |
| 113 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 159 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 114 | CONFIG_IP_NF_TARGET_NETMAP=m | 160 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 115 | CONFIG_IP_NF_TARGET_REDIRECT=m | 161 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 116 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
| 117 | CONFIG_IP_NF_MANGLE=m | 162 | CONFIG_IP_NF_MANGLE=m |
| 118 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 163 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
| 119 | CONFIG_IP_NF_TARGET_ECN=m | 164 | CONFIG_IP_NF_TARGET_ECN=m |
| @@ -123,7 +168,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
| 123 | CONFIG_IP_NF_ARPFILTER=m | 168 | CONFIG_IP_NF_ARPFILTER=m |
| 124 | CONFIG_IP_NF_ARP_MANGLE=m | 169 | CONFIG_IP_NF_ARP_MANGLE=m |
| 125 | CONFIG_NF_CONNTRACK_IPV6=m | 170 | CONFIG_NF_CONNTRACK_IPV6=m |
| 126 | CONFIG_IP6_NF_QUEUE=m | ||
| 127 | CONFIG_IP6_NF_IPTABLES=m | 171 | CONFIG_IP6_NF_IPTABLES=m |
| 128 | CONFIG_IP6_NF_MATCH_AH=m | 172 | CONFIG_IP6_NF_MATCH_AH=m |
| 129 | CONFIG_IP6_NF_MATCH_EUI64=m | 173 | CONFIG_IP6_NF_MATCH_EUI64=m |
| @@ -132,21 +176,34 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
| 132 | CONFIG_IP6_NF_MATCH_HL=m | 176 | CONFIG_IP6_NF_MATCH_HL=m |
| 133 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 177 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 134 | CONFIG_IP6_NF_MATCH_MH=m | 178 | CONFIG_IP6_NF_MATCH_MH=m |
| 179 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
| 135 | CONFIG_IP6_NF_MATCH_RT=m | 180 | CONFIG_IP6_NF_MATCH_RT=m |
| 136 | CONFIG_IP6_NF_TARGET_HL=m | 181 | CONFIG_IP6_NF_TARGET_HL=m |
| 137 | CONFIG_IP6_NF_TARGET_LOG=m | ||
| 138 | CONFIG_IP6_NF_FILTER=m | 182 | CONFIG_IP6_NF_FILTER=m |
| 139 | CONFIG_IP6_NF_TARGET_REJECT=m | 183 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 140 | CONFIG_IP6_NF_MANGLE=m | 184 | CONFIG_IP6_NF_MANGLE=m |
| 141 | CONFIG_IP6_NF_RAW=m | 185 | CONFIG_IP6_NF_RAW=m |
| 186 | CONFIG_NF_NAT_IPV6=m | ||
| 187 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
| 188 | CONFIG_IP6_NF_TARGET_NPT=m | ||
| 142 | CONFIG_IP_DCCP=m | 189 | CONFIG_IP_DCCP=m |
| 143 | # CONFIG_IP_DCCP_CCID3 is not set | 190 | # CONFIG_IP_DCCP_CCID3 is not set |
| 191 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
| 192 | CONFIG_RDS=m | ||
| 193 | CONFIG_RDS_TCP=m | ||
| 194 | CONFIG_L2TP=m | ||
| 144 | CONFIG_ATALK=m | 195 | CONFIG_ATALK=m |
| 196 | CONFIG_BATMAN_ADV=m | ||
| 197 | CONFIG_BATMAN_ADV_DAT=y | ||
| 198 | # CONFIG_WIRELESS is not set | ||
| 145 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 199 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 200 | CONFIG_DEVTMPFS=y | ||
| 146 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 201 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
| 202 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
| 147 | CONFIG_CONNECTOR=m | 203 | CONFIG_CONNECTOR=m |
| 148 | CONFIG_BLK_DEV_LOOP=y | 204 | CONFIG_BLK_DEV_LOOP=y |
| 149 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 205 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
| 206 | CONFIG_BLK_DEV_DRBD=m | ||
| 150 | CONFIG_BLK_DEV_NBD=m | 207 | CONFIG_BLK_DEV_NBD=m |
| 151 | CONFIG_BLK_DEV_RAM=y | 208 | CONFIG_BLK_DEV_RAM=y |
| 152 | CONFIG_CDROM_PKTCDVD=m | 209 | CONFIG_CDROM_PKTCDVD=m |
| @@ -161,59 +218,77 @@ CONFIG_BLK_DEV_SR=y | |||
| 161 | CONFIG_BLK_DEV_SR_VENDOR=y | 218 | CONFIG_BLK_DEV_SR_VENDOR=y |
| 162 | CONFIG_CHR_DEV_SG=m | 219 | CONFIG_CHR_DEV_SG=m |
| 163 | CONFIG_SCSI_CONSTANTS=y | 220 | CONFIG_SCSI_CONSTANTS=y |
| 164 | CONFIG_SCSI_SAS_LIBSAS=m | 221 | CONFIG_SCSI_SAS_ATTRS=m |
| 165 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
| 166 | CONFIG_SCSI_SRP_ATTRS=m | ||
| 167 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
| 168 | CONFIG_ISCSI_TCP=m | 222 | CONFIG_ISCSI_TCP=m |
| 223 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
| 169 | CONFIG_MD=y | 224 | CONFIG_MD=y |
| 170 | CONFIG_BLK_DEV_MD=m | ||
| 171 | CONFIG_MD_LINEAR=m | 225 | CONFIG_MD_LINEAR=m |
| 172 | CONFIG_MD_RAID0=m | 226 | CONFIG_MD_RAID0=m |
| 173 | CONFIG_MD_RAID1=m | ||
| 174 | CONFIG_MD_RAID456=m | ||
| 175 | CONFIG_BLK_DEV_DM=m | 227 | CONFIG_BLK_DEV_DM=m |
| 176 | CONFIG_DM_CRYPT=m | 228 | CONFIG_DM_CRYPT=m |
| 177 | CONFIG_DM_SNAPSHOT=m | 229 | CONFIG_DM_SNAPSHOT=m |
| 230 | CONFIG_DM_THIN_PROVISIONING=m | ||
| 231 | CONFIG_DM_CACHE=m | ||
| 178 | CONFIG_DM_MIRROR=m | 232 | CONFIG_DM_MIRROR=m |
| 233 | CONFIG_DM_RAID=m | ||
| 179 | CONFIG_DM_ZERO=m | 234 | CONFIG_DM_ZERO=m |
| 180 | CONFIG_DM_MULTIPATH=m | 235 | CONFIG_DM_MULTIPATH=m |
| 181 | CONFIG_DM_UEVENT=y | 236 | CONFIG_DM_UEVENT=y |
| 237 | CONFIG_TARGET_CORE=m | ||
| 238 | CONFIG_TCM_IBLOCK=m | ||
| 239 | CONFIG_TCM_FILEIO=m | ||
| 240 | CONFIG_TCM_PSCSI=m | ||
| 182 | CONFIG_NETDEVICES=y | 241 | CONFIG_NETDEVICES=y |
| 183 | CONFIG_DUMMY=m | 242 | CONFIG_DUMMY=m |
| 184 | CONFIG_MACVLAN=m | ||
| 185 | CONFIG_EQUALIZER=m | 243 | CONFIG_EQUALIZER=m |
| 244 | CONFIG_NET_TEAM=m | ||
| 245 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
| 246 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
| 247 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
| 248 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
| 249 | CONFIG_VXLAN=m | ||
| 250 | CONFIG_NETCONSOLE=m | ||
| 251 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
| 186 | CONFIG_VETH=m | 252 | CONFIG_VETH=m |
| 187 | CONFIG_NET_ETHERNET=y | ||
| 188 | CONFIG_HPLANCE=y | 253 | CONFIG_HPLANCE=y |
| 189 | # CONFIG_NETDEV_1000 is not set | 254 | # CONFIG_NET_CADENCE is not set |
| 190 | # CONFIG_NETDEV_10000 is not set | 255 | # CONFIG_NET_VENDOR_BROADCOM is not set |
| 256 | # CONFIG_NET_VENDOR_INTEL is not set | ||
| 257 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
| 258 | # CONFIG_NET_VENDOR_MICREL is not set | ||
| 259 | # CONFIG_NET_VENDOR_NATSEMI is not set | ||
| 260 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
| 261 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
| 262 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
| 191 | CONFIG_PPP=m | 263 | CONFIG_PPP=m |
| 192 | CONFIG_PPP_FILTER=y | ||
| 193 | CONFIG_PPP_ASYNC=m | ||
| 194 | CONFIG_PPP_SYNC_TTY=m | ||
| 195 | CONFIG_PPP_DEFLATE=m | ||
| 196 | CONFIG_PPP_BSDCOMP=m | 264 | CONFIG_PPP_BSDCOMP=m |
| 265 | CONFIG_PPP_DEFLATE=m | ||
| 266 | CONFIG_PPP_FILTER=y | ||
| 197 | CONFIG_PPP_MPPE=m | 267 | CONFIG_PPP_MPPE=m |
| 198 | CONFIG_PPPOE=m | 268 | CONFIG_PPPOE=m |
| 269 | CONFIG_PPTP=m | ||
| 270 | CONFIG_PPPOL2TP=m | ||
| 271 | CONFIG_PPP_ASYNC=m | ||
| 272 | CONFIG_PPP_SYNC_TTY=m | ||
| 199 | CONFIG_SLIP=m | 273 | CONFIG_SLIP=m |
| 200 | CONFIG_SLIP_COMPRESSED=y | 274 | CONFIG_SLIP_COMPRESSED=y |
| 201 | CONFIG_SLIP_SMART=y | 275 | CONFIG_SLIP_SMART=y |
| 202 | CONFIG_SLIP_MODE_SLIP6=y | 276 | CONFIG_SLIP_MODE_SLIP6=y |
| 203 | CONFIG_NETCONSOLE=m | 277 | # CONFIG_WLAN is not set |
| 204 | CONFIG_NETCONSOLE_DYNAMIC=y | 278 | CONFIG_INPUT_EVDEV=m |
| 205 | CONFIG_INPUT_FF_MEMLESS=m | ||
| 206 | # CONFIG_KEYBOARD_ATKBD is not set | 279 | # CONFIG_KEYBOARD_ATKBD is not set |
| 207 | CONFIG_MOUSE_PS2=m | 280 | # CONFIG_MOUSE_PS2 is not set |
| 208 | CONFIG_MOUSE_SERIAL=m | 281 | CONFIG_MOUSE_SERIAL=m |
| 209 | CONFIG_INPUT_MISC=y | 282 | CONFIG_INPUT_MISC=y |
| 210 | CONFIG_HP_SDC_RTC=m | 283 | CONFIG_HP_SDC_RTC=m |
| 211 | # CONFIG_SERIO_SERPORT is not set | 284 | CONFIG_SERIO_SERPORT=m |
| 212 | CONFIG_VT_HW_CONSOLE_BINDING=y | 285 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 286 | # CONFIG_LEGACY_PTYS is not set | ||
| 213 | # CONFIG_DEVKMEM is not set | 287 | # CONFIG_DEVKMEM is not set |
| 214 | # CONFIG_HW_RANDOM is not set | 288 | # CONFIG_HW_RANDOM is not set |
| 215 | CONFIG_GEN_RTC=m | 289 | CONFIG_NTP_PPS=y |
| 216 | CONFIG_GEN_RTC_X=y | 290 | CONFIG_PPS_CLIENT_LDISC=m |
| 291 | CONFIG_PTP_1588_CLOCK=m | ||
| 217 | # CONFIG_HWMON is not set | 292 | # CONFIG_HWMON is not set |
| 218 | CONFIG_FB=y | 293 | CONFIG_FB=y |
| 219 | CONFIG_FRAMEBUFFER_CONSOLE=y | 294 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| @@ -222,47 +297,60 @@ CONFIG_LOGO=y | |||
| 222 | # CONFIG_LOGO_LINUX_VGA16 is not set | 297 | # CONFIG_LOGO_LINUX_VGA16 is not set |
| 223 | CONFIG_HID=m | 298 | CONFIG_HID=m |
| 224 | CONFIG_HIDRAW=y | 299 | CONFIG_HIDRAW=y |
| 300 | CONFIG_UHID=m | ||
| 301 | # CONFIG_HID_GENERIC is not set | ||
| 225 | # CONFIG_USB_SUPPORT is not set | 302 | # CONFIG_USB_SUPPORT is not set |
| 303 | CONFIG_RTC_CLASS=y | ||
| 304 | CONFIG_RTC_DRV_GENERIC=m | ||
| 305 | # CONFIG_IOMMU_SUPPORT is not set | ||
| 306 | CONFIG_PROC_HARDWARE=y | ||
| 226 | CONFIG_EXT2_FS=y | 307 | CONFIG_EXT2_FS=y |
| 227 | CONFIG_EXT3_FS=y | 308 | CONFIG_EXT3_FS=y |
| 228 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 309 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
| 229 | # CONFIG_EXT3_FS_XATTR is not set | 310 | # CONFIG_EXT3_FS_XATTR is not set |
| 311 | CONFIG_EXT4_FS=y | ||
| 230 | CONFIG_REISERFS_FS=m | 312 | CONFIG_REISERFS_FS=m |
| 231 | CONFIG_JFS_FS=m | 313 | CONFIG_JFS_FS=m |
| 232 | CONFIG_XFS_FS=m | 314 | CONFIG_XFS_FS=m |
| 233 | CONFIG_OCFS2_FS=m | 315 | CONFIG_OCFS2_FS=m |
| 234 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 235 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 316 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 317 | CONFIG_FANOTIFY=y | ||
| 236 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 318 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 237 | # CONFIG_PRINT_QUOTA_WARNING is not set | 319 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 238 | CONFIG_AUTOFS_FS=m | ||
| 239 | CONFIG_AUTOFS4_FS=m | 320 | CONFIG_AUTOFS4_FS=m |
| 240 | CONFIG_FUSE_FS=m | 321 | CONFIG_FUSE_FS=m |
| 322 | CONFIG_CUSE=m | ||
| 241 | CONFIG_ISO9660_FS=y | 323 | CONFIG_ISO9660_FS=y |
| 242 | CONFIG_JOLIET=y | 324 | CONFIG_JOLIET=y |
| 243 | CONFIG_ZISOFS=y | 325 | CONFIG_ZISOFS=y |
| 244 | CONFIG_UDF_FS=m | 326 | CONFIG_UDF_FS=m |
| 245 | CONFIG_MSDOS_FS=y | 327 | CONFIG_MSDOS_FS=m |
| 246 | CONFIG_VFAT_FS=m | 328 | CONFIG_VFAT_FS=m |
| 247 | CONFIG_PROC_KCORE=y | 329 | CONFIG_PROC_KCORE=y |
| 248 | CONFIG_TMPFS=y | 330 | CONFIG_TMPFS=y |
| 249 | CONFIG_AFFS_FS=m | 331 | CONFIG_AFFS_FS=m |
| 332 | CONFIG_ECRYPT_FS=m | ||
| 333 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
| 250 | CONFIG_HFS_FS=m | 334 | CONFIG_HFS_FS=m |
| 251 | CONFIG_HFSPLUS_FS=m | 335 | CONFIG_HFSPLUS_FS=m |
| 252 | CONFIG_CRAMFS=m | 336 | CONFIG_CRAMFS=m |
| 253 | CONFIG_SQUASHFS=m | 337 | CONFIG_SQUASHFS=m |
| 254 | CONFIG_MINIX_FS=y | 338 | CONFIG_SQUASHFS_LZO=y |
| 339 | CONFIG_MINIX_FS=m | ||
| 340 | CONFIG_OMFS_FS=m | ||
| 255 | CONFIG_HPFS_FS=m | 341 | CONFIG_HPFS_FS=m |
| 342 | CONFIG_QNX4FS_FS=m | ||
| 343 | CONFIG_QNX6FS_FS=m | ||
| 256 | CONFIG_SYSV_FS=m | 344 | CONFIG_SYSV_FS=m |
| 257 | CONFIG_UFS_FS=m | 345 | CONFIG_UFS_FS=m |
| 258 | CONFIG_NFS_FS=y | 346 | CONFIG_NFS_FS=y |
| 259 | CONFIG_NFS_V3=y | ||
| 260 | CONFIG_NFS_V4=y | 347 | CONFIG_NFS_V4=y |
| 348 | CONFIG_NFS_SWAP=y | ||
| 261 | CONFIG_ROOT_NFS=y | 349 | CONFIG_ROOT_NFS=y |
| 262 | CONFIG_NFSD=m | 350 | CONFIG_NFSD=m |
| 263 | CONFIG_NFSD_V3=y | 351 | CONFIG_NFSD_V3=y |
| 264 | CONFIG_SMB_FS=m | 352 | CONFIG_CIFS=m |
| 265 | CONFIG_SMB_NLS_DEFAULT=y | 353 | # CONFIG_CIFS_DEBUG is not set |
| 266 | CONFIG_CODA_FS=m | 354 | CONFIG_CODA_FS=m |
| 267 | CONFIG_NLS_CODEPAGE_437=y | 355 | CONFIG_NLS_CODEPAGE_437=y |
| 268 | CONFIG_NLS_CODEPAGE_737=m | 356 | CONFIG_NLS_CODEPAGE_737=m |
| @@ -301,10 +389,23 @@ CONFIG_NLS_ISO8859_14=m | |||
| 301 | CONFIG_NLS_ISO8859_15=m | 389 | CONFIG_NLS_ISO8859_15=m |
| 302 | CONFIG_NLS_KOI8_R=m | 390 | CONFIG_NLS_KOI8_R=m |
| 303 | CONFIG_NLS_KOI8_U=m | 391 | CONFIG_NLS_KOI8_U=m |
| 392 | CONFIG_NLS_MAC_ROMAN=m | ||
| 393 | CONFIG_NLS_MAC_CELTIC=m | ||
| 394 | CONFIG_NLS_MAC_CENTEURO=m | ||
| 395 | CONFIG_NLS_MAC_CROATIAN=m | ||
| 396 | CONFIG_NLS_MAC_CYRILLIC=m | ||
| 397 | CONFIG_NLS_MAC_GAELIC=m | ||
| 398 | CONFIG_NLS_MAC_GREEK=m | ||
| 399 | CONFIG_NLS_MAC_ICELAND=m | ||
| 400 | CONFIG_NLS_MAC_INUIT=m | ||
| 401 | CONFIG_NLS_MAC_ROMANIAN=m | ||
| 402 | CONFIG_NLS_MAC_TURKISH=m | ||
| 304 | CONFIG_DLM=m | 403 | CONFIG_DLM=m |
| 305 | CONFIG_MAGIC_SYSRQ=y | 404 | CONFIG_MAGIC_SYSRQ=y |
| 306 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 405 | CONFIG_ASYNC_RAID6_TEST=m |
| 307 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 406 | CONFIG_ENCRYPTED_KEYS=m |
| 407 | CONFIG_CRYPTO_MANAGER=y | ||
| 408 | CONFIG_CRYPTO_USER=m | ||
| 308 | CONFIG_CRYPTO_NULL=m | 409 | CONFIG_CRYPTO_NULL=m |
| 309 | CONFIG_CRYPTO_CRYPTD=m | 410 | CONFIG_CRYPTO_CRYPTD=m |
| 310 | CONFIG_CRYPTO_TEST=m | 411 | CONFIG_CRYPTO_TEST=m |
| @@ -314,19 +415,16 @@ CONFIG_CRYPTO_CTS=m | |||
| 314 | CONFIG_CRYPTO_LRW=m | 415 | CONFIG_CRYPTO_LRW=m |
| 315 | CONFIG_CRYPTO_PCBC=m | 416 | CONFIG_CRYPTO_PCBC=m |
| 316 | CONFIG_CRYPTO_XTS=m | 417 | CONFIG_CRYPTO_XTS=m |
| 317 | CONFIG_CRYPTO_HMAC=y | ||
| 318 | CONFIG_CRYPTO_XCBC=m | 418 | CONFIG_CRYPTO_XCBC=m |
| 319 | CONFIG_CRYPTO_MD4=m | 419 | CONFIG_CRYPTO_VMAC=m |
| 320 | CONFIG_CRYPTO_MICHAEL_MIC=m | 420 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 321 | CONFIG_CRYPTO_RMD128=m | 421 | CONFIG_CRYPTO_RMD128=m |
| 322 | CONFIG_CRYPTO_RMD160=m | 422 | CONFIG_CRYPTO_RMD160=m |
| 323 | CONFIG_CRYPTO_RMD256=m | 423 | CONFIG_CRYPTO_RMD256=m |
| 324 | CONFIG_CRYPTO_RMD320=m | 424 | CONFIG_CRYPTO_RMD320=m |
| 325 | CONFIG_CRYPTO_SHA256=m | ||
| 326 | CONFIG_CRYPTO_SHA512=m | 425 | CONFIG_CRYPTO_SHA512=m |
| 327 | CONFIG_CRYPTO_TGR192=m | 426 | CONFIG_CRYPTO_TGR192=m |
| 328 | CONFIG_CRYPTO_WP512=m | 427 | CONFIG_CRYPTO_WP512=m |
| 329 | CONFIG_CRYPTO_AES=m | ||
| 330 | CONFIG_CRYPTO_ANUBIS=m | 428 | CONFIG_CRYPTO_ANUBIS=m |
| 331 | CONFIG_CRYPTO_BLOWFISH=m | 429 | CONFIG_CRYPTO_BLOWFISH=m |
| 332 | CONFIG_CRYPTO_CAMELLIA=m | 430 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -342,6 +440,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
| 342 | CONFIG_CRYPTO_ZLIB=m | 440 | CONFIG_CRYPTO_ZLIB=m |
| 343 | CONFIG_CRYPTO_LZO=m | 441 | CONFIG_CRYPTO_LZO=m |
| 344 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 442 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 443 | CONFIG_CRYPTO_USER_API_HASH=m | ||
| 444 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
| 345 | # CONFIG_CRYPTO_HW is not set | 445 | # CONFIG_CRYPTO_HW is not set |
| 346 | CONFIG_CRC16=m | ||
| 347 | CONFIG_CRC_T10DIF=y | 446 | CONFIG_CRC_T10DIF=y |
| 447 | CONFIG_XZ_DEC_X86=y | ||
| 448 | CONFIG_XZ_DEC_POWERPC=y | ||
| 449 | CONFIG_XZ_DEC_IA64=y | ||
| 450 | CONFIG_XZ_DEC_ARM=y | ||
| 451 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
| 452 | CONFIG_XZ_DEC_SPARC=y | ||
| 453 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index cb9dfb30b674..7d46fbec7042 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig | |||
| @@ -1,49 +1,75 @@ | |||
| 1 | CONFIG_EXPERIMENTAL=y | ||
| 2 | CONFIG_LOCALVERSION="-mac" | 1 | CONFIG_LOCALVERSION="-mac" |
| 3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
| 4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
| 4 | CONFIG_FHANDLE=y | ||
| 5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
| 6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
| 7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
| 8 | # CONFIG_UTS_NS is not set | ||
| 9 | # CONFIG_IPC_NS is not set | ||
| 10 | # CONFIG_PID_NS is not set | ||
| 11 | # CONFIG_NET_NS is not set | ||
| 8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
| 9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
| 11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
| 12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
| 13 | CONFIG_MAC=y | 16 | CONFIG_PARTITION_ADVANCED=y |
| 17 | CONFIG_AMIGA_PARTITION=y | ||
| 18 | CONFIG_ATARI_PARTITION=y | ||
| 19 | CONFIG_BSD_DISKLABEL=y | ||
| 20 | CONFIG_MINIX_SUBPARTITION=y | ||
| 21 | CONFIG_SOLARIS_X86_PARTITION=y | ||
| 22 | CONFIG_UNIXWARE_DISKLABEL=y | ||
| 23 | CONFIG_SUN_PARTITION=y | ||
| 24 | # CONFIG_EFI_PARTITION is not set | ||
| 25 | CONFIG_SYSV68_PARTITION=y | ||
| 26 | CONFIG_IOSCHED_DEADLINE=m | ||
| 14 | CONFIG_M68020=y | 27 | CONFIG_M68020=y |
| 15 | CONFIG_M68030=y | 28 | CONFIG_M68030=y |
| 16 | CONFIG_M68040=y | 29 | CONFIG_M68040=y |
| 30 | CONFIG_M68KFPU_EMU=y | ||
| 31 | CONFIG_MAC=y | ||
| 32 | # CONFIG_COMPACTION is not set | ||
| 33 | CONFIG_CLEANCACHE=y | ||
| 34 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 17 | CONFIG_BINFMT_AOUT=m | 35 | CONFIG_BINFMT_AOUT=m |
| 18 | CONFIG_BINFMT_MISC=m | 36 | CONFIG_BINFMT_MISC=m |
| 19 | CONFIG_PROC_HARDWARE=y | ||
| 20 | CONFIG_NET=y | 37 | CONFIG_NET=y |
| 21 | CONFIG_PACKET=y | 38 | CONFIG_PACKET=y |
| 39 | CONFIG_PACKET_DIAG=m | ||
| 22 | CONFIG_UNIX=y | 40 | CONFIG_UNIX=y |
| 41 | CONFIG_UNIX_DIAG=m | ||
| 42 | CONFIG_XFRM_MIGRATE=y | ||
| 23 | CONFIG_NET_KEY=y | 43 | CONFIG_NET_KEY=y |
| 24 | CONFIG_NET_KEY_MIGRATE=y | ||
| 25 | CONFIG_INET=y | 44 | CONFIG_INET=y |
| 45 | CONFIG_IP_PNP=y | ||
| 46 | CONFIG_IP_PNP_DHCP=y | ||
| 47 | CONFIG_IP_PNP_BOOTP=y | ||
| 48 | CONFIG_IP_PNP_RARP=y | ||
| 26 | CONFIG_NET_IPIP=m | 49 | CONFIG_NET_IPIP=m |
| 50 | CONFIG_NET_IPGRE_DEMUX=m | ||
| 27 | CONFIG_NET_IPGRE=m | 51 | CONFIG_NET_IPGRE=m |
| 28 | CONFIG_SYN_COOKIES=y | 52 | CONFIG_SYN_COOKIES=y |
| 53 | CONFIG_NET_IPVTI=m | ||
| 29 | CONFIG_INET_AH=m | 54 | CONFIG_INET_AH=m |
| 30 | CONFIG_INET_ESP=m | 55 | CONFIG_INET_ESP=m |
| 31 | CONFIG_INET_IPCOMP=m | 56 | CONFIG_INET_IPCOMP=m |
| 32 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 57 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 33 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 58 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 34 | CONFIG_INET_XFRM_MODE_BEET=m | 59 | CONFIG_INET_XFRM_MODE_BEET=m |
| 60 | # CONFIG_INET_LRO is not set | ||
| 35 | CONFIG_INET_DIAG=m | 61 | CONFIG_INET_DIAG=m |
| 62 | CONFIG_INET_UDP_DIAG=m | ||
| 36 | CONFIG_IPV6_PRIVACY=y | 63 | CONFIG_IPV6_PRIVACY=y |
| 37 | CONFIG_IPV6_ROUTER_PREF=y | 64 | CONFIG_IPV6_ROUTER_PREF=y |
| 38 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 39 | CONFIG_INET6_AH=m | 65 | CONFIG_INET6_AH=m |
| 40 | CONFIG_INET6_ESP=m | 66 | CONFIG_INET6_ESP=m |
| 41 | CONFIG_INET6_IPCOMP=m | 67 | CONFIG_INET6_IPCOMP=m |
| 42 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 68 | CONFIG_IPV6_GRE=m |
| 43 | CONFIG_IPV6_TUNNEL=m | ||
| 44 | CONFIG_NETFILTER=y | 69 | CONFIG_NETFILTER=y |
| 45 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
| 46 | CONFIG_NF_CONNTRACK=m | 70 | CONFIG_NF_CONNTRACK=m |
| 71 | CONFIG_NF_CONNTRACK_ZONES=y | ||
| 72 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
| 47 | # CONFIG_NF_CT_PROTO_DCCP is not set | 73 | # CONFIG_NF_CT_PROTO_DCCP is not set |
| 48 | CONFIG_NF_CT_PROTO_UDPLITE=m | 74 | CONFIG_NF_CT_PROTO_UDPLITE=m |
| 49 | CONFIG_NF_CONNTRACK_AMANDA=m | 75 | CONFIG_NF_CONNTRACK_AMANDA=m |
| @@ -51,25 +77,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
| 51 | CONFIG_NF_CONNTRACK_H323=m | 77 | CONFIG_NF_CONNTRACK_H323=m |
| 52 | CONFIG_NF_CONNTRACK_IRC=m | 78 | CONFIG_NF_CONNTRACK_IRC=m |
| 53 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 79 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
| 80 | CONFIG_NF_CONNTRACK_SNMP=m | ||
| 54 | CONFIG_NF_CONNTRACK_PPTP=m | 81 | CONFIG_NF_CONNTRACK_PPTP=m |
| 55 | CONFIG_NF_CONNTRACK_SANE=m | 82 | CONFIG_NF_CONNTRACK_SANE=m |
| 56 | CONFIG_NF_CONNTRACK_SIP=m | 83 | CONFIG_NF_CONNTRACK_SIP=m |
| 57 | CONFIG_NF_CONNTRACK_TFTP=m | 84 | CONFIG_NF_CONNTRACK_TFTP=m |
| 85 | CONFIG_NETFILTER_XT_SET=m | ||
| 86 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
| 58 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 87 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 59 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 88 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 60 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 89 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 90 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
| 91 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
| 92 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
| 61 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 93 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 62 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 94 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 63 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 95 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 96 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
| 97 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
| 64 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 98 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 65 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 99 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 66 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 100 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 101 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
| 102 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
| 67 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 103 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
| 68 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 104 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 69 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 105 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 106 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
| 70 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 107 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| 71 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 108 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 72 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 109 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 110 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
| 73 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 111 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 74 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 112 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 75 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 113 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| @@ -80,6 +118,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
| 80 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 118 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 81 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 119 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 82 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 120 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
| 121 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
| 122 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
| 83 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 123 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 84 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 124 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 85 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 125 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| @@ -93,22 +133,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 93 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 133 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 94 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 134 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 95 | CONFIG_NETFILTER_XT_MATCH_U32=m | 135 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 136 | CONFIG_IP_SET=m | ||
| 137 | CONFIG_IP_SET_BITMAP_IP=m | ||
| 138 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
| 139 | CONFIG_IP_SET_BITMAP_PORT=m | ||
| 140 | CONFIG_IP_SET_HASH_IP=m | ||
| 141 | CONFIG_IP_SET_HASH_IPPORT=m | ||
| 142 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
| 143 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
| 144 | CONFIG_IP_SET_HASH_NET=m | ||
| 145 | CONFIG_IP_SET_HASH_NETPORT=m | ||
| 146 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
| 147 | CONFIG_IP_SET_LIST_SET=m | ||
| 96 | CONFIG_NF_CONNTRACK_IPV4=m | 148 | CONFIG_NF_CONNTRACK_IPV4=m |
| 97 | CONFIG_IP_NF_QUEUE=m | ||
| 98 | CONFIG_IP_NF_IPTABLES=m | 149 | CONFIG_IP_NF_IPTABLES=m |
| 99 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 100 | CONFIG_IP_NF_MATCH_AH=m | 150 | CONFIG_IP_NF_MATCH_AH=m |
| 101 | CONFIG_IP_NF_MATCH_ECN=m | 151 | CONFIG_IP_NF_MATCH_ECN=m |
| 152 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
| 102 | CONFIG_IP_NF_MATCH_TTL=m | 153 | CONFIG_IP_NF_MATCH_TTL=m |
| 103 | CONFIG_IP_NF_FILTER=m | 154 | CONFIG_IP_NF_FILTER=m |
| 104 | CONFIG_IP_NF_TARGET_REJECT=m | 155 | CONFIG_IP_NF_TARGET_REJECT=m |
| 105 | CONFIG_IP_NF_TARGET_LOG=m | ||
| 106 | CONFIG_IP_NF_TARGET_ULOG=m | 156 | CONFIG_IP_NF_TARGET_ULOG=m |
| 107 | CONFIG_NF_NAT=m | 157 | CONFIG_NF_NAT_IPV4=m |
| 108 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 158 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 109 | CONFIG_IP_NF_TARGET_NETMAP=m | 159 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 110 | CONFIG_IP_NF_TARGET_REDIRECT=m | 160 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 111 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
| 112 | CONFIG_IP_NF_MANGLE=m | 161 | CONFIG_IP_NF_MANGLE=m |
| 113 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 162 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
| 114 | CONFIG_IP_NF_TARGET_ECN=m | 163 | CONFIG_IP_NF_TARGET_ECN=m |
| @@ -118,7 +167,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
| 118 | CONFIG_IP_NF_ARPFILTER=m | 167 | CONFIG_IP_NF_ARPFILTER=m |
| 119 | CONFIG_IP_NF_ARP_MANGLE=m | 168 | CONFIG_IP_NF_ARP_MANGLE=m |
| 120 | CONFIG_NF_CONNTRACK_IPV6=m | 169 | CONFIG_NF_CONNTRACK_IPV6=m |
| 121 | CONFIG_IP6_NF_QUEUE=m | ||
| 122 | CONFIG_IP6_NF_IPTABLES=m | 170 | CONFIG_IP6_NF_IPTABLES=m |
| 123 | CONFIG_IP6_NF_MATCH_AH=m | 171 | CONFIG_IP6_NF_MATCH_AH=m |
| 124 | CONFIG_IP6_NF_MATCH_EUI64=m | 172 | CONFIG_IP6_NF_MATCH_EUI64=m |
| @@ -127,31 +175,45 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
| 127 | CONFIG_IP6_NF_MATCH_HL=m | 175 | CONFIG_IP6_NF_MATCH_HL=m |
| 128 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 176 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 129 | CONFIG_IP6_NF_MATCH_MH=m | 177 | CONFIG_IP6_NF_MATCH_MH=m |
| 178 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
| 130 | CONFIG_IP6_NF_MATCH_RT=m | 179 | CONFIG_IP6_NF_MATCH_RT=m |
| 131 | CONFIG_IP6_NF_TARGET_HL=m | 180 | CONFIG_IP6_NF_TARGET_HL=m |
| 132 | CONFIG_IP6_NF_TARGET_LOG=m | ||
| 133 | CONFIG_IP6_NF_FILTER=m | 181 | CONFIG_IP6_NF_FILTER=m |
| 134 | CONFIG_IP6_NF_TARGET_REJECT=m | 182 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 135 | CONFIG_IP6_NF_MANGLE=m | 183 | CONFIG_IP6_NF_MANGLE=m |
| 136 | CONFIG_IP6_NF_RAW=m | 184 | CONFIG_IP6_NF_RAW=m |
| 185 | CONFIG_NF_NAT_IPV6=m | ||
| 186 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
| 187 | CONFIG_IP6_NF_TARGET_NPT=m | ||
| 137 | CONFIG_IP_DCCP=m | 188 | CONFIG_IP_DCCP=m |
| 138 | # CONFIG_IP_DCCP_CCID3 is not set | 189 | # CONFIG_IP_DCCP_CCID3 is not set |
| 190 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
| 191 | CONFIG_RDS=m | ||
| 192 | CONFIG_RDS_TCP=m | ||
| 193 | CONFIG_L2TP=m | ||
| 139 | CONFIG_ATALK=m | 194 | CONFIG_ATALK=m |
| 140 | CONFIG_DEV_APPLETALK=m | 195 | CONFIG_DEV_APPLETALK=m |
| 141 | CONFIG_IPDDP=m | 196 | CONFIG_IPDDP=m |
| 142 | CONFIG_IPDDP_ENCAP=y | 197 | CONFIG_IPDDP_ENCAP=y |
| 143 | CONFIG_IPDDP_DECAP=y | 198 | CONFIG_IPDDP_DECAP=y |
| 199 | CONFIG_BATMAN_ADV=m | ||
| 200 | CONFIG_BATMAN_ADV_DAT=y | ||
| 201 | # CONFIG_WIRELESS is not set | ||
| 144 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 202 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 203 | CONFIG_DEVTMPFS=y | ||
| 145 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 204 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
| 205 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
| 146 | CONFIG_CONNECTOR=m | 206 | CONFIG_CONNECTOR=m |
| 147 | CONFIG_BLK_DEV_SWIM=y | 207 | CONFIG_BLK_DEV_SWIM=m |
| 148 | CONFIG_BLK_DEV_LOOP=y | 208 | CONFIG_BLK_DEV_LOOP=y |
| 149 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 209 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
| 210 | CONFIG_BLK_DEV_DRBD=m | ||
| 150 | CONFIG_BLK_DEV_NBD=m | 211 | CONFIG_BLK_DEV_NBD=m |
| 151 | CONFIG_BLK_DEV_RAM=y | 212 | CONFIG_BLK_DEV_RAM=y |
| 152 | CONFIG_CDROM_PKTCDVD=m | 213 | CONFIG_CDROM_PKTCDVD=m |
| 153 | CONFIG_ATA_OVER_ETH=m | 214 | CONFIG_ATA_OVER_ETH=m |
| 154 | CONFIG_IDE=y | 215 | CONFIG_IDE=y |
| 216 | CONFIG_IDE_GD_ATAPI=y | ||
| 155 | CONFIG_BLK_DEV_IDECD=y | 217 | CONFIG_BLK_DEV_IDECD=y |
| 156 | CONFIG_BLK_DEV_MAC_IDE=y | 218 | CONFIG_BLK_DEV_MAC_IDE=y |
| 157 | CONFIG_RAID_ATTRS=m | 219 | CONFIG_RAID_ATTRS=m |
| @@ -164,29 +226,30 @@ CONFIG_BLK_DEV_SR=y | |||
| 164 | CONFIG_BLK_DEV_SR_VENDOR=y | 226 | CONFIG_BLK_DEV_SR_VENDOR=y |
| 165 | CONFIG_CHR_DEV_SG=m | 227 | CONFIG_CHR_DEV_SG=m |
| 166 | CONFIG_SCSI_CONSTANTS=y | 228 | CONFIG_SCSI_CONSTANTS=y |
| 167 | CONFIG_SCSI_SAS_LIBSAS=m | 229 | CONFIG_SCSI_SAS_ATTRS=m |
| 168 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
| 169 | CONFIG_SCSI_SRP_ATTRS=m | ||
| 170 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
| 171 | CONFIG_ISCSI_TCP=m | 230 | CONFIG_ISCSI_TCP=m |
| 231 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
| 172 | CONFIG_MAC_SCSI=y | 232 | CONFIG_MAC_SCSI=y |
| 173 | CONFIG_SCSI_MAC_ESP=y | 233 | CONFIG_SCSI_MAC_ESP=y |
| 174 | CONFIG_MD=y | 234 | CONFIG_MD=y |
| 175 | CONFIG_BLK_DEV_MD=m | ||
| 176 | CONFIG_MD_LINEAR=m | 235 | CONFIG_MD_LINEAR=m |
| 177 | CONFIG_MD_RAID0=m | 236 | CONFIG_MD_RAID0=m |
| 178 | CONFIG_MD_RAID1=m | ||
| 179 | CONFIG_MD_RAID456=m | ||
| 180 | CONFIG_BLK_DEV_DM=m | 237 | CONFIG_BLK_DEV_DM=m |
| 181 | CONFIG_DM_CRYPT=m | 238 | CONFIG_DM_CRYPT=m |
| 182 | CONFIG_DM_SNAPSHOT=m | 239 | CONFIG_DM_SNAPSHOT=m |
| 240 | CONFIG_DM_THIN_PROVISIONING=m | ||
| 241 | CONFIG_DM_CACHE=m | ||
| 183 | CONFIG_DM_MIRROR=m | 242 | CONFIG_DM_MIRROR=m |
| 243 | CONFIG_DM_RAID=m | ||
| 184 | CONFIG_DM_ZERO=m | 244 | CONFIG_DM_ZERO=m |
| 185 | CONFIG_DM_MULTIPATH=m | 245 | CONFIG_DM_MULTIPATH=m |
| 186 | CONFIG_DM_UEVENT=y | 246 | CONFIG_DM_UEVENT=y |
| 247 | CONFIG_TARGET_CORE=m | ||
| 248 | CONFIG_TCM_IBLOCK=m | ||
| 249 | CONFIG_TCM_FILEIO=m | ||
| 250 | CONFIG_TCM_PSCSI=m | ||
| 187 | CONFIG_ADB=y | 251 | CONFIG_ADB=y |
| 188 | CONFIG_ADB_MACII=y | 252 | CONFIG_ADB_MACII=y |
| 189 | CONFIG_ADB_MACIISI=y | ||
| 190 | CONFIG_ADB_IOP=y | 253 | CONFIG_ADB_IOP=y |
| 191 | CONFIG_ADB_PMU68K=y | 254 | CONFIG_ADB_PMU68K=y |
| 192 | CONFIG_ADB_CUDA=y | 255 | CONFIG_ADB_CUDA=y |
| @@ -194,46 +257,61 @@ CONFIG_INPUT_ADBHID=y | |||
| 194 | CONFIG_MAC_EMUMOUSEBTN=y | 257 | CONFIG_MAC_EMUMOUSEBTN=y |
| 195 | CONFIG_NETDEVICES=y | 258 | CONFIG_NETDEVICES=y |
| 196 | CONFIG_DUMMY=m | 259 | CONFIG_DUMMY=m |
| 197 | CONFIG_MACVLAN=m | ||
| 198 | CONFIG_EQUALIZER=m | 260 | CONFIG_EQUALIZER=m |
| 261 | CONFIG_NET_TEAM=m | ||
| 262 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
| 263 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
| 264 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
| 265 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
| 266 | CONFIG_VXLAN=m | ||
| 267 | CONFIG_NETCONSOLE=m | ||
| 268 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
| 199 | CONFIG_VETH=m | 269 | CONFIG_VETH=m |
| 200 | CONFIG_NET_ETHERNET=y | ||
| 201 | CONFIG_MAC8390=y | ||
| 202 | CONFIG_MAC89x0=m | ||
| 203 | CONFIG_MACSONIC=m | ||
| 204 | CONFIG_MACMACE=y | 270 | CONFIG_MACMACE=y |
| 205 | # CONFIG_NETDEV_1000 is not set | 271 | # CONFIG_NET_CADENCE is not set |
| 206 | # CONFIG_NETDEV_10000 is not set | 272 | # CONFIG_NET_VENDOR_BROADCOM is not set |
| 273 | CONFIG_MAC89x0=y | ||
| 274 | # CONFIG_NET_VENDOR_INTEL is not set | ||
| 275 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
| 276 | # CONFIG_NET_VENDOR_MICREL is not set | ||
| 277 | CONFIG_MACSONIC=y | ||
| 278 | CONFIG_MAC8390=y | ||
| 279 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
| 280 | # CONFIG_NET_VENDOR_SMSC is not set | ||
| 281 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
| 282 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
| 207 | CONFIG_PPP=m | 283 | CONFIG_PPP=m |
| 208 | CONFIG_PPP_FILTER=y | ||
| 209 | CONFIG_PPP_ASYNC=m | ||
| 210 | CONFIG_PPP_SYNC_TTY=m | ||
| 211 | CONFIG_PPP_DEFLATE=m | ||
| 212 | CONFIG_PPP_BSDCOMP=m | 284 | CONFIG_PPP_BSDCOMP=m |
| 285 | CONFIG_PPP_DEFLATE=m | ||
| 286 | CONFIG_PPP_FILTER=y | ||
| 213 | CONFIG_PPP_MPPE=m | 287 | CONFIG_PPP_MPPE=m |
| 214 | CONFIG_PPPOE=m | 288 | CONFIG_PPPOE=m |
| 289 | CONFIG_PPTP=m | ||
| 290 | CONFIG_PPPOL2TP=m | ||
| 291 | CONFIG_PPP_ASYNC=m | ||
| 292 | CONFIG_PPP_SYNC_TTY=m | ||
| 215 | CONFIG_SLIP=m | 293 | CONFIG_SLIP=m |
| 216 | CONFIG_SLIP_COMPRESSED=y | 294 | CONFIG_SLIP_COMPRESSED=y |
| 217 | CONFIG_SLIP_SMART=y | 295 | CONFIG_SLIP_SMART=y |
| 218 | CONFIG_SLIP_MODE_SLIP6=y | 296 | CONFIG_SLIP_MODE_SLIP6=y |
| 219 | CONFIG_NETCONSOLE=m | 297 | # CONFIG_WLAN is not set |
| 220 | CONFIG_NETCONSOLE_DYNAMIC=y | 298 | CONFIG_INPUT_EVDEV=m |
| 221 | CONFIG_INPUT_FF_MEMLESS=m | ||
| 222 | # CONFIG_KEYBOARD_ATKBD is not set | 299 | # CONFIG_KEYBOARD_ATKBD is not set |
| 223 | CONFIG_MOUSE_PS2=m | 300 | # CONFIG_MOUSE_PS2 is not set |
| 224 | CONFIG_MOUSE_SERIAL=m | 301 | CONFIG_MOUSE_SERIAL=m |
| 225 | CONFIG_INPUT_MISC=y | 302 | CONFIG_INPUT_MISC=y |
| 226 | CONFIG_INPUT_M68K_BEEP=m | 303 | CONFIG_INPUT_M68K_BEEP=m |
| 227 | CONFIG_SERIO=m | 304 | CONFIG_SERIO=m |
| 228 | # CONFIG_SERIO_SERPORT is not set | ||
| 229 | CONFIG_VT_HW_CONSOLE_BINDING=y | 305 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 306 | # CONFIG_LEGACY_PTYS is not set | ||
| 230 | # CONFIG_DEVKMEM is not set | 307 | # CONFIG_DEVKMEM is not set |
| 231 | CONFIG_SERIAL_PMACZILOG=y | 308 | CONFIG_SERIAL_PMACZILOG=y |
| 232 | CONFIG_SERIAL_PMACZILOG_TTYS=y | 309 | CONFIG_SERIAL_PMACZILOG_TTYS=y |
| 233 | CONFIG_SERIAL_PMACZILOG_CONSOLE=y | 310 | CONFIG_SERIAL_PMACZILOG_CONSOLE=y |
| 234 | # CONFIG_HW_RANDOM is not set | 311 | # CONFIG_HW_RANDOM is not set |
| 235 | CONFIG_GEN_RTC=m | 312 | CONFIG_NTP_PPS=y |
| 236 | CONFIG_GEN_RTC_X=y | 313 | CONFIG_PPS_CLIENT_LDISC=m |
| 314 | CONFIG_PTP_1588_CLOCK=m | ||
| 237 | # CONFIG_HWMON is not set | 315 | # CONFIG_HWMON is not set |
| 238 | CONFIG_FB=y | 316 | CONFIG_FB=y |
| 239 | CONFIG_FB_VALKYRIE=y | 317 | CONFIG_FB_VALKYRIE=y |
| @@ -242,46 +320,60 @@ CONFIG_FRAMEBUFFER_CONSOLE=y | |||
| 242 | CONFIG_LOGO=y | 320 | CONFIG_LOGO=y |
| 243 | CONFIG_HID=m | 321 | CONFIG_HID=m |
| 244 | CONFIG_HIDRAW=y | 322 | CONFIG_HIDRAW=y |
| 323 | CONFIG_UHID=m | ||
| 324 | # CONFIG_HID_GENERIC is not set | ||
| 245 | # CONFIG_USB_SUPPORT is not set | 325 | # CONFIG_USB_SUPPORT is not set |
| 326 | CONFIG_RTC_CLASS=y | ||
| 327 | CONFIG_RTC_DRV_GENERIC=m | ||
| 328 | # CONFIG_IOMMU_SUPPORT is not set | ||
| 329 | CONFIG_PROC_HARDWARE=y | ||
| 246 | CONFIG_EXT2_FS=y | 330 | CONFIG_EXT2_FS=y |
| 247 | CONFIG_EXT3_FS=y | 331 | CONFIG_EXT3_FS=y |
| 248 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 332 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
| 249 | # CONFIG_EXT3_FS_XATTR is not set | 333 | # CONFIG_EXT3_FS_XATTR is not set |
| 334 | CONFIG_EXT4_FS=y | ||
| 250 | CONFIG_REISERFS_FS=m | 335 | CONFIG_REISERFS_FS=m |
| 251 | CONFIG_JFS_FS=m | 336 | CONFIG_JFS_FS=m |
| 252 | CONFIG_XFS_FS=m | 337 | CONFIG_XFS_FS=m |
| 253 | CONFIG_OCFS2_FS=m | 338 | CONFIG_OCFS2_FS=m |
| 254 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 255 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 339 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 340 | CONFIG_FANOTIFY=y | ||
| 256 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 341 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 257 | # CONFIG_PRINT_QUOTA_WARNING is not set | 342 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 258 | CONFIG_AUTOFS_FS=m | ||
| 259 | CONFIG_AUTOFS4_FS=m | 343 | CONFIG_AUTOFS4_FS=m |
| 260 | CONFIG_FUSE_FS=m | 344 | CONFIG_FUSE_FS=m |
| 345 | CONFIG_CUSE=m | ||
| 261 | CONFIG_ISO9660_FS=y | 346 | CONFIG_ISO9660_FS=y |
| 262 | CONFIG_JOLIET=y | 347 | CONFIG_JOLIET=y |
| 263 | CONFIG_ZISOFS=y | 348 | CONFIG_ZISOFS=y |
| 264 | CONFIG_UDF_FS=m | 349 | CONFIG_UDF_FS=m |
| 265 | CONFIG_MSDOS_FS=y | 350 | CONFIG_MSDOS_FS=m |
| 266 | CONFIG_VFAT_FS=m | 351 | CONFIG_VFAT_FS=m |
| 267 | CONFIG_PROC_KCORE=y | 352 | CONFIG_PROC_KCORE=y |
| 268 | CONFIG_TMPFS=y | 353 | CONFIG_TMPFS=y |
| 269 | CONFIG_AFFS_FS=m | 354 | CONFIG_AFFS_FS=m |
| 270 | CONFIG_HFS_FS=y | 355 | CONFIG_ECRYPT_FS=m |
| 271 | CONFIG_HFSPLUS_FS=y | 356 | CONFIG_ECRYPT_FS_MESSAGING=y |
| 357 | CONFIG_HFS_FS=m | ||
| 358 | CONFIG_HFSPLUS_FS=m | ||
| 272 | CONFIG_CRAMFS=m | 359 | CONFIG_CRAMFS=m |
| 273 | CONFIG_SQUASHFS=m | 360 | CONFIG_SQUASHFS=m |
| 274 | CONFIG_MINIX_FS=y | 361 | CONFIG_SQUASHFS_LZO=y |
| 362 | CONFIG_MINIX_FS=m | ||
| 363 | CONFIG_OMFS_FS=m | ||
| 275 | CONFIG_HPFS_FS=m | 364 | CONFIG_HPFS_FS=m |
| 365 | CONFIG_QNX4FS_FS=m | ||
| 366 | CONFIG_QNX6FS_FS=m | ||
| 276 | CONFIG_SYSV_FS=m | 367 | CONFIG_SYSV_FS=m |
| 277 | CONFIG_UFS_FS=m | 368 | CONFIG_UFS_FS=m |
| 278 | CONFIG_NFS_FS=m | 369 | CONFIG_NFS_FS=y |
| 279 | CONFIG_NFS_V3=y | ||
| 280 | CONFIG_NFS_V4=y | 370 | CONFIG_NFS_V4=y |
| 371 | CONFIG_NFS_SWAP=y | ||
| 372 | CONFIG_ROOT_NFS=y | ||
| 281 | CONFIG_NFSD=m | 373 | CONFIG_NFSD=m |
| 282 | CONFIG_NFSD_V3=y | 374 | CONFIG_NFSD_V3=y |
| 283 | CONFIG_SMB_FS=m | 375 | CONFIG_CIFS=m |
| 284 | CONFIG_SMB_NLS_DEFAULT=y | 376 | # CONFIG_CIFS_DEBUG is not set |
| 285 | CONFIG_CODA_FS=m | 377 | CONFIG_CODA_FS=m |
| 286 | CONFIG_NLS_CODEPAGE_437=y | 378 | CONFIG_NLS_CODEPAGE_437=y |
| 287 | CONFIG_NLS_CODEPAGE_737=m | 379 | CONFIG_NLS_CODEPAGE_737=m |
| @@ -320,10 +412,23 @@ CONFIG_NLS_ISO8859_14=m | |||
| 320 | CONFIG_NLS_ISO8859_15=m | 412 | CONFIG_NLS_ISO8859_15=m |
| 321 | CONFIG_NLS_KOI8_R=m | 413 | CONFIG_NLS_KOI8_R=m |
| 322 | CONFIG_NLS_KOI8_U=m | 414 | CONFIG_NLS_KOI8_U=m |
| 415 | CONFIG_NLS_MAC_ROMAN=m | ||
| 416 | CONFIG_NLS_MAC_CELTIC=m | ||
| 417 | CONFIG_NLS_MAC_CENTEURO=m | ||
| 418 | CONFIG_NLS_MAC_CROATIAN=m | ||
| 419 | CONFIG_NLS_MAC_CYRILLIC=m | ||
| 420 | CONFIG_NLS_MAC_GAELIC=m | ||
| 421 | CONFIG_NLS_MAC_GREEK=m | ||
| 422 | CONFIG_NLS_MAC_ICELAND=m | ||
| 423 | CONFIG_NLS_MAC_INUIT=m | ||
| 424 | CONFIG_NLS_MAC_ROMANIAN=m | ||
| 425 | CONFIG_NLS_MAC_TURKISH=m | ||
| 323 | CONFIG_DLM=m | 426 | CONFIG_DLM=m |
| 324 | CONFIG_MAGIC_SYSRQ=y | 427 | CONFIG_MAGIC_SYSRQ=y |
| 325 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 428 | CONFIG_ASYNC_RAID6_TEST=m |
| 326 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 429 | CONFIG_ENCRYPTED_KEYS=m |
| 430 | CONFIG_CRYPTO_MANAGER=y | ||
| 431 | CONFIG_CRYPTO_USER=m | ||
| 327 | CONFIG_CRYPTO_NULL=m | 432 | CONFIG_CRYPTO_NULL=m |
| 328 | CONFIG_CRYPTO_CRYPTD=m | 433 | CONFIG_CRYPTO_CRYPTD=m |
| 329 | CONFIG_CRYPTO_TEST=m | 434 | CONFIG_CRYPTO_TEST=m |
| @@ -333,19 +438,16 @@ CONFIG_CRYPTO_CTS=m | |||
| 333 | CONFIG_CRYPTO_LRW=m | 438 | CONFIG_CRYPTO_LRW=m |
| 334 | CONFIG_CRYPTO_PCBC=m | 439 | CONFIG_CRYPTO_PCBC=m |
| 335 | CONFIG_CRYPTO_XTS=m | 440 | CONFIG_CRYPTO_XTS=m |
| 336 | CONFIG_CRYPTO_HMAC=y | ||
| 337 | CONFIG_CRYPTO_XCBC=m | 441 | CONFIG_CRYPTO_XCBC=m |
| 338 | CONFIG_CRYPTO_MD4=m | 442 | CONFIG_CRYPTO_VMAC=m |
| 339 | CONFIG_CRYPTO_MICHAEL_MIC=m | 443 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 340 | CONFIG_CRYPTO_RMD128=m | 444 | CONFIG_CRYPTO_RMD128=m |
| 341 | CONFIG_CRYPTO_RMD160=m | 445 | CONFIG_CRYPTO_RMD160=m |
| 342 | CONFIG_CRYPTO_RMD256=m | 446 | CONFIG_CRYPTO_RMD256=m |
| 343 | CONFIG_CRYPTO_RMD320=m | 447 | CONFIG_CRYPTO_RMD320=m |
| 344 | CONFIG_CRYPTO_SHA256=m | ||
| 345 | CONFIG_CRYPTO_SHA512=m | 448 | CONFIG_CRYPTO_SHA512=m |
| 346 | CONFIG_CRYPTO_TGR192=m | 449 | CONFIG_CRYPTO_TGR192=m |
| 347 | CONFIG_CRYPTO_WP512=m | 450 | CONFIG_CRYPTO_WP512=m |
| 348 | CONFIG_CRYPTO_AES=m | ||
| 349 | CONFIG_CRYPTO_ANUBIS=m | 451 | CONFIG_CRYPTO_ANUBIS=m |
| 350 | CONFIG_CRYPTO_BLOWFISH=m | 452 | CONFIG_CRYPTO_BLOWFISH=m |
| 351 | CONFIG_CRYPTO_CAMELLIA=m | 453 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -361,6 +463,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
| 361 | CONFIG_CRYPTO_ZLIB=m | 463 | CONFIG_CRYPTO_ZLIB=m |
| 362 | CONFIG_CRYPTO_LZO=m | 464 | CONFIG_CRYPTO_LZO=m |
| 363 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 465 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 466 | CONFIG_CRYPTO_USER_API_HASH=m | ||
| 467 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
| 364 | # CONFIG_CRYPTO_HW is not set | 468 | # CONFIG_CRYPTO_HW is not set |
| 365 | CONFIG_CRC16=m | ||
| 366 | CONFIG_CRC_T10DIF=y | 469 | CONFIG_CRC_T10DIF=y |
| 470 | CONFIG_XZ_DEC_X86=y | ||
| 471 | CONFIG_XZ_DEC_POWERPC=y | ||
| 472 | CONFIG_XZ_DEC_IA64=y | ||
| 473 | CONFIG_XZ_DEC_ARM=y | ||
| 474 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
| 475 | CONFIG_XZ_DEC_SPARC=y | ||
| 476 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index 8d5def4a31e0..0f795d8e65fa 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig | |||
| @@ -1,15 +1,29 @@ | |||
| 1 | CONFIG_EXPERIMENTAL=y | ||
| 2 | CONFIG_LOCALVERSION="-multi" | 1 | CONFIG_LOCALVERSION="-multi" |
| 3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
| 4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
| 4 | CONFIG_FHANDLE=y | ||
| 5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
| 6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
| 7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
| 8 | # CONFIG_UTS_NS is not set | ||
| 9 | # CONFIG_IPC_NS is not set | ||
| 10 | # CONFIG_PID_NS is not set | ||
| 11 | # CONFIG_NET_NS is not set | ||
| 8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
| 9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
| 11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
| 12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
| 16 | CONFIG_PARTITION_ADVANCED=y | ||
| 17 | CONFIG_BSD_DISKLABEL=y | ||
| 18 | CONFIG_MINIX_SUBPARTITION=y | ||
| 19 | CONFIG_SOLARIS_X86_PARTITION=y | ||
| 20 | CONFIG_UNIXWARE_DISKLABEL=y | ||
| 21 | # CONFIG_EFI_PARTITION is not set | ||
| 22 | CONFIG_IOSCHED_DEADLINE=m | ||
| 23 | CONFIG_M68020=y | ||
| 24 | CONFIG_M68040=y | ||
| 25 | CONFIG_M68060=y | ||
| 26 | CONFIG_M68KFPU_EMU=y | ||
| 13 | CONFIG_AMIGA=y | 27 | CONFIG_AMIGA=y |
| 14 | CONFIG_ATARI=y | 28 | CONFIG_ATARI=y |
| 15 | CONFIG_MAC=y | 29 | CONFIG_MAC=y |
| @@ -21,48 +35,50 @@ CONFIG_BVME6000=y | |||
| 21 | CONFIG_HP300=y | 35 | CONFIG_HP300=y |
| 22 | CONFIG_SUN3X=y | 36 | CONFIG_SUN3X=y |
| 23 | CONFIG_Q40=y | 37 | CONFIG_Q40=y |
| 24 | CONFIG_M68020=y | ||
| 25 | CONFIG_M68040=y | ||
| 26 | CONFIG_M68060=y | ||
| 27 | CONFIG_BINFMT_AOUT=m | ||
| 28 | CONFIG_BINFMT_MISC=m | ||
| 29 | CONFIG_ZORRO=y | 38 | CONFIG_ZORRO=y |
| 30 | CONFIG_AMIGA_PCMCIA=y | 39 | CONFIG_AMIGA_PCMCIA=y |
| 31 | CONFIG_STRAM_PROC=y | ||
| 32 | CONFIG_HEARTBEAT=y | ||
| 33 | CONFIG_PROC_HARDWARE=y | ||
| 34 | CONFIG_ZORRO_NAMES=y | 40 | CONFIG_ZORRO_NAMES=y |
| 41 | # CONFIG_COMPACTION is not set | ||
| 42 | CONFIG_CLEANCACHE=y | ||
| 43 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 44 | CONFIG_BINFMT_AOUT=m | ||
| 45 | CONFIG_BINFMT_MISC=m | ||
| 35 | CONFIG_NET=y | 46 | CONFIG_NET=y |
| 36 | CONFIG_PACKET=y | 47 | CONFIG_PACKET=y |
| 48 | CONFIG_PACKET_DIAG=m | ||
| 37 | CONFIG_UNIX=y | 49 | CONFIG_UNIX=y |
| 50 | CONFIG_UNIX_DIAG=m | ||
| 51 | CONFIG_XFRM_MIGRATE=y | ||
| 38 | CONFIG_NET_KEY=y | 52 | CONFIG_NET_KEY=y |
| 39 | CONFIG_NET_KEY_MIGRATE=y | ||
| 40 | CONFIG_INET=y | 53 | CONFIG_INET=y |
| 41 | CONFIG_IP_PNP=y | 54 | CONFIG_IP_PNP=y |
| 42 | CONFIG_IP_PNP_DHCP=y | 55 | CONFIG_IP_PNP_DHCP=y |
| 43 | CONFIG_IP_PNP_BOOTP=y | 56 | CONFIG_IP_PNP_BOOTP=y |
| 44 | CONFIG_IP_PNP_RARP=y | 57 | CONFIG_IP_PNP_RARP=y |
| 45 | CONFIG_NET_IPIP=m | 58 | CONFIG_NET_IPIP=m |
| 59 | CONFIG_NET_IPGRE_DEMUX=m | ||
| 46 | CONFIG_NET_IPGRE=m | 60 | CONFIG_NET_IPGRE=m |
| 47 | CONFIG_SYN_COOKIES=y | 61 | CONFIG_SYN_COOKIES=y |
| 62 | CONFIG_NET_IPVTI=m | ||
| 48 | CONFIG_INET_AH=m | 63 | CONFIG_INET_AH=m |
| 49 | CONFIG_INET_ESP=m | 64 | CONFIG_INET_ESP=m |
| 50 | CONFIG_INET_IPCOMP=m | 65 | CONFIG_INET_IPCOMP=m |
| 51 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 66 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 52 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 67 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 53 | CONFIG_INET_XFRM_MODE_BEET=m | 68 | CONFIG_INET_XFRM_MODE_BEET=m |
| 69 | # CONFIG_INET_LRO is not set | ||
| 54 | CONFIG_INET_DIAG=m | 70 | CONFIG_INET_DIAG=m |
| 71 | CONFIG_INET_UDP_DIAG=m | ||
| 55 | CONFIG_IPV6_PRIVACY=y | 72 | CONFIG_IPV6_PRIVACY=y |
| 56 | CONFIG_IPV6_ROUTER_PREF=y | 73 | CONFIG_IPV6_ROUTER_PREF=y |
| 57 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 58 | CONFIG_INET6_AH=m | 74 | CONFIG_INET6_AH=m |
| 59 | CONFIG_INET6_ESP=m | 75 | CONFIG_INET6_ESP=m |
| 60 | CONFIG_INET6_IPCOMP=m | 76 | CONFIG_INET6_IPCOMP=m |
| 61 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 77 | CONFIG_IPV6_GRE=m |
| 62 | CONFIG_IPV6_TUNNEL=m | ||
| 63 | CONFIG_NETFILTER=y | 78 | CONFIG_NETFILTER=y |
| 64 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
| 65 | CONFIG_NF_CONNTRACK=m | 79 | CONFIG_NF_CONNTRACK=m |
| 80 | CONFIG_NF_CONNTRACK_ZONES=y | ||
| 81 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
| 66 | # CONFIG_NF_CT_PROTO_DCCP is not set | 82 | # CONFIG_NF_CT_PROTO_DCCP is not set |
| 67 | CONFIG_NF_CT_PROTO_UDPLITE=m | 83 | CONFIG_NF_CT_PROTO_UDPLITE=m |
| 68 | CONFIG_NF_CONNTRACK_AMANDA=m | 84 | CONFIG_NF_CONNTRACK_AMANDA=m |
| @@ -70,25 +86,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
| 70 | CONFIG_NF_CONNTRACK_H323=m | 86 | CONFIG_NF_CONNTRACK_H323=m |
| 71 | CONFIG_NF_CONNTRACK_IRC=m | 87 | CONFIG_NF_CONNTRACK_IRC=m |
| 72 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 88 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
| 89 | CONFIG_NF_CONNTRACK_SNMP=m | ||
| 73 | CONFIG_NF_CONNTRACK_PPTP=m | 90 | CONFIG_NF_CONNTRACK_PPTP=m |
| 74 | CONFIG_NF_CONNTRACK_SANE=m | 91 | CONFIG_NF_CONNTRACK_SANE=m |
| 75 | CONFIG_NF_CONNTRACK_SIP=m | 92 | CONFIG_NF_CONNTRACK_SIP=m |
| 76 | CONFIG_NF_CONNTRACK_TFTP=m | 93 | CONFIG_NF_CONNTRACK_TFTP=m |
| 94 | CONFIG_NETFILTER_XT_SET=m | ||
| 95 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
| 77 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 96 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 78 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 97 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 79 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 98 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 99 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
| 100 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
| 101 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
| 80 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 102 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 81 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 103 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 82 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 104 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 105 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
| 106 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
| 83 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 107 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 84 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 108 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 85 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 109 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 110 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
| 111 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
| 86 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 112 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
| 87 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 113 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 88 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 114 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 115 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
| 89 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 116 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| 90 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 117 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 91 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 118 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 119 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
| 92 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 120 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 93 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 121 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 94 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 122 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| @@ -99,6 +127,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
| 99 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 127 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 100 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 128 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 101 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 129 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
| 130 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
| 131 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
| 102 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 132 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 103 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 133 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 104 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 134 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| @@ -112,22 +142,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 112 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 142 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 113 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 143 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 114 | CONFIG_NETFILTER_XT_MATCH_U32=m | 144 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 145 | CONFIG_IP_SET=m | ||
| 146 | CONFIG_IP_SET_BITMAP_IP=m | ||
| 147 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
| 148 | CONFIG_IP_SET_BITMAP_PORT=m | ||
| 149 | CONFIG_IP_SET_HASH_IP=m | ||
| 150 | CONFIG_IP_SET_HASH_IPPORT=m | ||
| 151 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
| 152 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
| 153 | CONFIG_IP_SET_HASH_NET=m | ||
| 154 | CONFIG_IP_SET_HASH_NETPORT=m | ||
| 155 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
| 156 | CONFIG_IP_SET_LIST_SET=m | ||
| 115 | CONFIG_NF_CONNTRACK_IPV4=m | 157 | CONFIG_NF_CONNTRACK_IPV4=m |
| 116 | CONFIG_IP_NF_QUEUE=m | ||
| 117 | CONFIG_IP_NF_IPTABLES=m | 158 | CONFIG_IP_NF_IPTABLES=m |
| 118 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 119 | CONFIG_IP_NF_MATCH_AH=m | 159 | CONFIG_IP_NF_MATCH_AH=m |
| 120 | CONFIG_IP_NF_MATCH_ECN=m | 160 | CONFIG_IP_NF_MATCH_ECN=m |
| 161 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
| 121 | CONFIG_IP_NF_MATCH_TTL=m | 162 | CONFIG_IP_NF_MATCH_TTL=m |
| 122 | CONFIG_IP_NF_FILTER=m | 163 | CONFIG_IP_NF_FILTER=m |
| 123 | CONFIG_IP_NF_TARGET_REJECT=m | 164 | CONFIG_IP_NF_TARGET_REJECT=m |
| 124 | CONFIG_IP_NF_TARGET_LOG=m | ||
| 125 | CONFIG_IP_NF_TARGET_ULOG=m | 165 | CONFIG_IP_NF_TARGET_ULOG=m |
| 126 | CONFIG_NF_NAT=m | 166 | CONFIG_NF_NAT_IPV4=m |
| 127 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 167 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 128 | CONFIG_IP_NF_TARGET_NETMAP=m | 168 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 129 | CONFIG_IP_NF_TARGET_REDIRECT=m | 169 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 130 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
| 131 | CONFIG_IP_NF_MANGLE=m | 170 | CONFIG_IP_NF_MANGLE=m |
| 132 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 171 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
| 133 | CONFIG_IP_NF_TARGET_ECN=m | 172 | CONFIG_IP_NF_TARGET_ECN=m |
| @@ -137,7 +176,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
| 137 | CONFIG_IP_NF_ARPFILTER=m | 176 | CONFIG_IP_NF_ARPFILTER=m |
| 138 | CONFIG_IP_NF_ARP_MANGLE=m | 177 | CONFIG_IP_NF_ARP_MANGLE=m |
| 139 | CONFIG_NF_CONNTRACK_IPV6=m | 178 | CONFIG_NF_CONNTRACK_IPV6=m |
| 140 | CONFIG_IP6_NF_QUEUE=m | ||
| 141 | CONFIG_IP6_NF_IPTABLES=m | 179 | CONFIG_IP6_NF_IPTABLES=m |
| 142 | CONFIG_IP6_NF_MATCH_AH=m | 180 | CONFIG_IP6_NF_MATCH_AH=m |
| 143 | CONFIG_IP6_NF_MATCH_EUI64=m | 181 | CONFIG_IP6_NF_MATCH_EUI64=m |
| @@ -146,22 +184,34 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
| 146 | CONFIG_IP6_NF_MATCH_HL=m | 184 | CONFIG_IP6_NF_MATCH_HL=m |
| 147 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 185 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 148 | CONFIG_IP6_NF_MATCH_MH=m | 186 | CONFIG_IP6_NF_MATCH_MH=m |
| 187 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
| 149 | CONFIG_IP6_NF_MATCH_RT=m | 188 | CONFIG_IP6_NF_MATCH_RT=m |
| 150 | CONFIG_IP6_NF_TARGET_HL=m | 189 | CONFIG_IP6_NF_TARGET_HL=m |
| 151 | CONFIG_IP6_NF_TARGET_LOG=m | ||
| 152 | CONFIG_IP6_NF_FILTER=m | 190 | CONFIG_IP6_NF_FILTER=m |
| 153 | CONFIG_IP6_NF_TARGET_REJECT=m | 191 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 154 | CONFIG_IP6_NF_MANGLE=m | 192 | CONFIG_IP6_NF_MANGLE=m |
| 155 | CONFIG_IP6_NF_RAW=m | 193 | CONFIG_IP6_NF_RAW=m |
| 194 | CONFIG_NF_NAT_IPV6=m | ||
| 195 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
| 196 | CONFIG_IP6_NF_TARGET_NPT=m | ||
| 156 | CONFIG_IP_DCCP=m | 197 | CONFIG_IP_DCCP=m |
| 157 | # CONFIG_IP_DCCP_CCID3 is not set | 198 | # CONFIG_IP_DCCP_CCID3 is not set |
| 199 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
| 200 | CONFIG_RDS=m | ||
| 201 | CONFIG_RDS_TCP=m | ||
| 202 | CONFIG_L2TP=m | ||
| 158 | CONFIG_ATALK=m | 203 | CONFIG_ATALK=m |
| 159 | CONFIG_DEV_APPLETALK=m | 204 | CONFIG_DEV_APPLETALK=m |
| 160 | CONFIG_IPDDP=m | 205 | CONFIG_IPDDP=m |
| 161 | CONFIG_IPDDP_ENCAP=y | 206 | CONFIG_IPDDP_ENCAP=y |
| 162 | CONFIG_IPDDP_DECAP=y | 207 | CONFIG_IPDDP_DECAP=y |
| 208 | CONFIG_BATMAN_ADV=m | ||
| 209 | CONFIG_BATMAN_ADV_DAT=y | ||
| 210 | # CONFIG_WIRELESS is not set | ||
| 163 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 211 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 212 | CONFIG_DEVTMPFS=y | ||
| 164 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 213 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
| 214 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
| 165 | CONFIG_CONNECTOR=m | 215 | CONFIG_CONNECTOR=m |
| 166 | CONFIG_PARPORT=m | 216 | CONFIG_PARPORT=m |
| 167 | CONFIG_PARPORT_AMIGA=m | 217 | CONFIG_PARPORT_AMIGA=m |
| @@ -170,15 +220,17 @@ CONFIG_PARPORT_ATARI=m | |||
| 170 | CONFIG_PARPORT_1284=y | 220 | CONFIG_PARPORT_1284=y |
| 171 | CONFIG_AMIGA_FLOPPY=y | 221 | CONFIG_AMIGA_FLOPPY=y |
| 172 | CONFIG_ATARI_FLOPPY=y | 222 | CONFIG_ATARI_FLOPPY=y |
| 173 | CONFIG_BLK_DEV_SWIM=y | 223 | CONFIG_BLK_DEV_SWIM=m |
| 174 | CONFIG_AMIGA_Z2RAM=y | 224 | CONFIG_AMIGA_Z2RAM=y |
| 175 | CONFIG_BLK_DEV_LOOP=y | 225 | CONFIG_BLK_DEV_LOOP=y |
| 176 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 226 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
| 227 | CONFIG_BLK_DEV_DRBD=m | ||
| 177 | CONFIG_BLK_DEV_NBD=m | 228 | CONFIG_BLK_DEV_NBD=m |
| 178 | CONFIG_BLK_DEV_RAM=y | 229 | CONFIG_BLK_DEV_RAM=y |
| 179 | CONFIG_CDROM_PKTCDVD=m | 230 | CONFIG_CDROM_PKTCDVD=m |
| 180 | CONFIG_ATA_OVER_ETH=m | 231 | CONFIG_ATA_OVER_ETH=m |
| 181 | CONFIG_IDE=y | 232 | CONFIG_IDE=y |
| 233 | CONFIG_IDE_GD_ATAPI=y | ||
| 182 | CONFIG_BLK_DEV_IDECD=y | 234 | CONFIG_BLK_DEV_IDECD=y |
| 183 | CONFIG_BLK_DEV_GAYLE=y | 235 | CONFIG_BLK_DEV_GAYLE=y |
| 184 | CONFIG_BLK_DEV_BUDDHA=y | 236 | CONFIG_BLK_DEV_BUDDHA=y |
| @@ -195,11 +247,9 @@ CONFIG_BLK_DEV_SR=y | |||
| 195 | CONFIG_BLK_DEV_SR_VENDOR=y | 247 | CONFIG_BLK_DEV_SR_VENDOR=y |
| 196 | CONFIG_CHR_DEV_SG=m | 248 | CONFIG_CHR_DEV_SG=m |
| 197 | CONFIG_SCSI_CONSTANTS=y | 249 | CONFIG_SCSI_CONSTANTS=y |
| 198 | CONFIG_SCSI_SAS_LIBSAS=m | 250 | CONFIG_SCSI_SAS_ATTRS=m |
| 199 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
| 200 | CONFIG_SCSI_SRP_ATTRS=m | ||
| 201 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
| 202 | CONFIG_ISCSI_TCP=m | 251 | CONFIG_ISCSI_TCP=m |
| 252 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
| 203 | CONFIG_A3000_SCSI=y | 253 | CONFIG_A3000_SCSI=y |
| 204 | CONFIG_A2091_SCSI=y | 254 | CONFIG_A2091_SCSI=y |
| 205 | CONFIG_GVP11_SCSI=y | 255 | CONFIG_GVP11_SCSI=y |
| @@ -213,21 +263,24 @@ CONFIG_MVME16x_SCSI=y | |||
| 213 | CONFIG_BVME6000_SCSI=y | 263 | CONFIG_BVME6000_SCSI=y |
| 214 | CONFIG_SUN3X_ESP=y | 264 | CONFIG_SUN3X_ESP=y |
| 215 | CONFIG_MD=y | 265 | CONFIG_MD=y |
| 216 | CONFIG_BLK_DEV_MD=m | ||
| 217 | CONFIG_MD_LINEAR=m | 266 | CONFIG_MD_LINEAR=m |
| 218 | CONFIG_MD_RAID0=m | 267 | CONFIG_MD_RAID0=m |
| 219 | CONFIG_MD_RAID1=m | ||
| 220 | CONFIG_MD_RAID456=m | ||
| 221 | CONFIG_BLK_DEV_DM=m | 268 | CONFIG_BLK_DEV_DM=m |
| 222 | CONFIG_DM_CRYPT=m | 269 | CONFIG_DM_CRYPT=m |
| 223 | CONFIG_DM_SNAPSHOT=m | 270 | CONFIG_DM_SNAPSHOT=m |
| 271 | CONFIG_DM_THIN_PROVISIONING=m | ||
| 272 | CONFIG_DM_CACHE=m | ||
| 224 | CONFIG_DM_MIRROR=m | 273 | CONFIG_DM_MIRROR=m |
| 274 | CONFIG_DM_RAID=m | ||
| 225 | CONFIG_DM_ZERO=m | 275 | CONFIG_DM_ZERO=m |
| 226 | CONFIG_DM_MULTIPATH=m | 276 | CONFIG_DM_MULTIPATH=m |
| 227 | CONFIG_DM_UEVENT=y | 277 | CONFIG_DM_UEVENT=y |
| 278 | CONFIG_TARGET_CORE=m | ||
| 279 | CONFIG_TCM_IBLOCK=m | ||
| 280 | CONFIG_TCM_FILEIO=m | ||
| 281 | CONFIG_TCM_PSCSI=m | ||
| 228 | CONFIG_ADB=y | 282 | CONFIG_ADB=y |
| 229 | CONFIG_ADB_MACII=y | 283 | CONFIG_ADB_MACII=y |
| 230 | CONFIG_ADB_MACIISI=y | ||
| 231 | CONFIG_ADB_IOP=y | 284 | CONFIG_ADB_IOP=y |
| 232 | CONFIG_ADB_PMU68K=y | 285 | CONFIG_ADB_PMU68K=y |
| 233 | CONFIG_ADB_CUDA=y | 286 | CONFIG_ADB_CUDA=y |
| @@ -235,49 +288,64 @@ CONFIG_INPUT_ADBHID=y | |||
| 235 | CONFIG_MAC_EMUMOUSEBTN=y | 288 | CONFIG_MAC_EMUMOUSEBTN=y |
| 236 | CONFIG_NETDEVICES=y | 289 | CONFIG_NETDEVICES=y |
| 237 | CONFIG_DUMMY=m | 290 | CONFIG_DUMMY=m |
| 238 | CONFIG_MACVLAN=m | ||
| 239 | CONFIG_EQUALIZER=m | 291 | CONFIG_EQUALIZER=m |
| 240 | CONFIG_VETH=m | ||
| 241 | CONFIG_NET_ETHERNET=y | ||
| 242 | CONFIG_MII=y | 292 | CONFIG_MII=y |
| 243 | CONFIG_ARIADNE=y | 293 | CONFIG_NET_TEAM=m |
| 294 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
| 295 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
| 296 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
| 297 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
| 298 | CONFIG_VXLAN=m | ||
| 299 | CONFIG_NETCONSOLE=m | ||
| 300 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
| 301 | CONFIG_VETH=m | ||
| 302 | # CONFIG_NET_VENDOR_3COM is not set | ||
| 244 | CONFIG_A2065=y | 303 | CONFIG_A2065=y |
| 245 | CONFIG_HYDRA=y | 304 | CONFIG_ARIADNE=y |
| 246 | CONFIG_ZORRO8390=y | ||
| 247 | CONFIG_APNE=y | ||
| 248 | CONFIG_MAC8390=y | ||
| 249 | CONFIG_MAC89x0=y | ||
| 250 | CONFIG_MACSONIC=y | ||
| 251 | CONFIG_MACMACE=y | ||
| 252 | CONFIG_MVME147_NET=y | ||
| 253 | CONFIG_MVME16x_NET=y | ||
| 254 | CONFIG_BVME6000_NET=y | ||
| 255 | CONFIG_ATARILANCE=y | 305 | CONFIG_ATARILANCE=y |
| 256 | CONFIG_SUN3LANCE=y | ||
| 257 | CONFIG_HPLANCE=y | 306 | CONFIG_HPLANCE=y |
| 307 | CONFIG_MVME147_NET=y | ||
| 308 | CONFIG_SUN3LANCE=y | ||
| 309 | CONFIG_MACMACE=y | ||
| 310 | # CONFIG_NET_CADENCE is not set | ||
| 311 | # CONFIG_NET_VENDOR_BROADCOM is not set | ||
| 312 | CONFIG_MAC89x0=y | ||
| 313 | # CONFIG_NET_VENDOR_FUJITSU is not set | ||
| 314 | # CONFIG_NET_VENDOR_HP is not set | ||
| 315 | CONFIG_BVME6000_NET=y | ||
| 316 | CONFIG_MVME16x_NET=y | ||
| 317 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
| 318 | # CONFIG_NET_VENDOR_MICREL is not set | ||
| 319 | CONFIG_MACSONIC=y | ||
| 320 | CONFIG_HYDRA=y | ||
| 321 | CONFIG_MAC8390=y | ||
| 258 | CONFIG_NE2000=m | 322 | CONFIG_NE2000=m |
| 259 | # CONFIG_NETDEV_1000 is not set | 323 | CONFIG_APNE=y |
| 260 | # CONFIG_NETDEV_10000 is not set | 324 | CONFIG_ZORRO8390=y |
| 325 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
| 326 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
| 327 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
| 261 | CONFIG_PPP=m | 328 | CONFIG_PPP=m |
| 262 | CONFIG_PPP_FILTER=y | ||
| 263 | CONFIG_PPP_ASYNC=m | ||
| 264 | CONFIG_PPP_SYNC_TTY=m | ||
| 265 | CONFIG_PPP_DEFLATE=m | ||
| 266 | CONFIG_PPP_BSDCOMP=m | 329 | CONFIG_PPP_BSDCOMP=m |
| 330 | CONFIG_PPP_DEFLATE=m | ||
| 331 | CONFIG_PPP_FILTER=y | ||
| 267 | CONFIG_PPP_MPPE=m | 332 | CONFIG_PPP_MPPE=m |
| 268 | CONFIG_PPPOE=m | 333 | CONFIG_PPPOE=m |
| 334 | CONFIG_PPTP=m | ||
| 335 | CONFIG_PPPOL2TP=m | ||
| 336 | CONFIG_PPP_ASYNC=m | ||
| 337 | CONFIG_PPP_SYNC_TTY=m | ||
| 269 | CONFIG_SLIP=m | 338 | CONFIG_SLIP=m |
| 270 | CONFIG_SLIP_COMPRESSED=y | 339 | CONFIG_SLIP_COMPRESSED=y |
| 271 | CONFIG_SLIP_SMART=y | 340 | CONFIG_SLIP_SMART=y |
| 272 | CONFIG_SLIP_MODE_SLIP6=y | 341 | CONFIG_SLIP_MODE_SLIP6=y |
| 273 | CONFIG_NETCONSOLE=m | 342 | # CONFIG_WLAN is not set |
| 274 | CONFIG_NETCONSOLE_DYNAMIC=y | 343 | CONFIG_INPUT_EVDEV=m |
| 275 | CONFIG_INPUT_FF_MEMLESS=m | ||
| 276 | CONFIG_KEYBOARD_AMIGA=y | 344 | CONFIG_KEYBOARD_AMIGA=y |
| 277 | CONFIG_KEYBOARD_ATARI=y | 345 | CONFIG_KEYBOARD_ATARI=y |
| 278 | # CONFIG_KEYBOARD_ATKBD is not set | 346 | # CONFIG_KEYBOARD_ATKBD is not set |
| 279 | CONFIG_KEYBOARD_SUNKBD=y | 347 | CONFIG_KEYBOARD_SUNKBD=y |
| 280 | CONFIG_MOUSE_PS2=m | 348 | # CONFIG_MOUSE_PS2 is not set |
| 281 | CONFIG_MOUSE_SERIAL=m | 349 | CONFIG_MOUSE_SERIAL=m |
| 282 | CONFIG_MOUSE_AMIGA=m | 350 | CONFIG_MOUSE_AMIGA=m |
| 283 | CONFIG_MOUSE_ATARI=m | 351 | CONFIG_MOUSE_ATARI=m |
| @@ -285,18 +353,20 @@ CONFIG_INPUT_JOYSTICK=y | |||
| 285 | CONFIG_JOYSTICK_AMIGA=m | 353 | CONFIG_JOYSTICK_AMIGA=m |
| 286 | CONFIG_INPUT_MISC=y | 354 | CONFIG_INPUT_MISC=y |
| 287 | CONFIG_INPUT_M68K_BEEP=m | 355 | CONFIG_INPUT_M68K_BEEP=m |
| 288 | CONFIG_HP_SDC_RTC=y | 356 | CONFIG_HP_SDC_RTC=m |
| 289 | # CONFIG_SERIO_SERPORT is not set | ||
| 290 | CONFIG_SERIO_Q40KBD=y | 357 | CONFIG_SERIO_Q40KBD=y |
| 291 | CONFIG_VT_HW_CONSOLE_BINDING=y | 358 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 359 | # CONFIG_LEGACY_PTYS is not set | ||
| 292 | # CONFIG_DEVKMEM is not set | 360 | # CONFIG_DEVKMEM is not set |
| 293 | CONFIG_SERIAL_PMACZILOG=y | 361 | CONFIG_SERIAL_PMACZILOG=y |
| 294 | CONFIG_SERIAL_PMACZILOG_TTYS=y | 362 | CONFIG_SERIAL_PMACZILOG_TTYS=y |
| 295 | CONFIG_SERIAL_PMACZILOG_CONSOLE=y | 363 | CONFIG_SERIAL_PMACZILOG_CONSOLE=y |
| 296 | CONFIG_PRINTER=m | 364 | CONFIG_PRINTER=m |
| 297 | # CONFIG_HW_RANDOM is not set | 365 | # CONFIG_HW_RANDOM is not set |
| 298 | CONFIG_GEN_RTC=y | 366 | CONFIG_NTP_PPS=y |
| 299 | CONFIG_GEN_RTC_X=y | 367 | CONFIG_PPS_CLIENT_LDISC=m |
| 368 | CONFIG_PPS_CLIENT_PARPORT=m | ||
| 369 | CONFIG_PTP_1588_CLOCK=m | ||
| 300 | # CONFIG_HWMON is not set | 370 | # CONFIG_HWMON is not set |
| 301 | CONFIG_FB=y | 371 | CONFIG_FB=y |
| 302 | CONFIG_FB_CIRRUS=y | 372 | CONFIG_FB_CIRRUS=y |
| @@ -316,7 +386,20 @@ CONFIG_DMASOUND_PAULA=m | |||
| 316 | CONFIG_DMASOUND_Q40=m | 386 | CONFIG_DMASOUND_Q40=m |
| 317 | CONFIG_HID=m | 387 | CONFIG_HID=m |
| 318 | CONFIG_HIDRAW=y | 388 | CONFIG_HIDRAW=y |
| 389 | CONFIG_UHID=m | ||
| 390 | # CONFIG_HID_GENERIC is not set | ||
| 319 | # CONFIG_USB_SUPPORT is not set | 391 | # CONFIG_USB_SUPPORT is not set |
| 392 | CONFIG_RTC_CLASS=y | ||
| 393 | CONFIG_RTC_DRV_MSM6242=m | ||
| 394 | CONFIG_RTC_DRV_RP5C01=m | ||
| 395 | CONFIG_RTC_DRV_GENERIC=m | ||
| 396 | # CONFIG_IOMMU_SUPPORT is not set | ||
| 397 | CONFIG_HEARTBEAT=y | ||
| 398 | CONFIG_PROC_HARDWARE=y | ||
| 399 | CONFIG_NATFEAT=y | ||
| 400 | CONFIG_NFBLOCK=y | ||
| 401 | CONFIG_NFCON=y | ||
| 402 | CONFIG_NFETH=y | ||
| 320 | CONFIG_ATARI_DSP56K=m | 403 | CONFIG_ATARI_DSP56K=m |
| 321 | CONFIG_AMIGA_BUILTIN_SERIAL=y | 404 | CONFIG_AMIGA_BUILTIN_SERIAL=y |
| 322 | CONFIG_SERIAL_CONSOLE=y | 405 | CONFIG_SERIAL_CONSOLE=y |
| @@ -324,42 +407,49 @@ CONFIG_EXT2_FS=y | |||
| 324 | CONFIG_EXT3_FS=y | 407 | CONFIG_EXT3_FS=y |
| 325 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 408 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
| 326 | # CONFIG_EXT3_FS_XATTR is not set | 409 | # CONFIG_EXT3_FS_XATTR is not set |
| 410 | CONFIG_EXT4_FS=y | ||
| 327 | CONFIG_REISERFS_FS=m | 411 | CONFIG_REISERFS_FS=m |
| 328 | CONFIG_JFS_FS=m | 412 | CONFIG_JFS_FS=m |
| 329 | CONFIG_XFS_FS=m | 413 | CONFIG_XFS_FS=m |
| 330 | CONFIG_OCFS2_FS=m | 414 | CONFIG_OCFS2_FS=m |
| 331 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 332 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 415 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 416 | CONFIG_FANOTIFY=y | ||
| 333 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 417 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 334 | # CONFIG_PRINT_QUOTA_WARNING is not set | 418 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 335 | CONFIG_AUTOFS_FS=m | ||
| 336 | CONFIG_AUTOFS4_FS=m | 419 | CONFIG_AUTOFS4_FS=m |
| 337 | CONFIG_FUSE_FS=m | 420 | CONFIG_FUSE_FS=m |
| 421 | CONFIG_CUSE=m | ||
| 338 | CONFIG_ISO9660_FS=y | 422 | CONFIG_ISO9660_FS=y |
| 339 | CONFIG_JOLIET=y | 423 | CONFIG_JOLIET=y |
| 340 | CONFIG_ZISOFS=y | 424 | CONFIG_ZISOFS=y |
| 341 | CONFIG_UDF_FS=m | 425 | CONFIG_UDF_FS=m |
| 342 | CONFIG_MSDOS_FS=y | 426 | CONFIG_MSDOS_FS=m |
| 343 | CONFIG_VFAT_FS=m | 427 | CONFIG_VFAT_FS=m |
| 344 | CONFIG_PROC_KCORE=y | 428 | CONFIG_PROC_KCORE=y |
| 345 | CONFIG_TMPFS=y | 429 | CONFIG_TMPFS=y |
| 346 | CONFIG_AFFS_FS=m | 430 | CONFIG_AFFS_FS=m |
| 347 | CONFIG_HFS_FS=y | 431 | CONFIG_ECRYPT_FS=m |
| 348 | CONFIG_HFSPLUS_FS=y | 432 | CONFIG_ECRYPT_FS_MESSAGING=y |
| 433 | CONFIG_HFS_FS=m | ||
| 434 | CONFIG_HFSPLUS_FS=m | ||
| 349 | CONFIG_CRAMFS=m | 435 | CONFIG_CRAMFS=m |
| 350 | CONFIG_SQUASHFS=m | 436 | CONFIG_SQUASHFS=m |
| 351 | CONFIG_MINIX_FS=y | 437 | CONFIG_SQUASHFS_LZO=y |
| 438 | CONFIG_MINIX_FS=m | ||
| 439 | CONFIG_OMFS_FS=m | ||
| 352 | CONFIG_HPFS_FS=m | 440 | CONFIG_HPFS_FS=m |
| 441 | CONFIG_QNX4FS_FS=m | ||
| 442 | CONFIG_QNX6FS_FS=m | ||
| 353 | CONFIG_SYSV_FS=m | 443 | CONFIG_SYSV_FS=m |
| 354 | CONFIG_UFS_FS=m | 444 | CONFIG_UFS_FS=m |
| 355 | CONFIG_NFS_FS=y | 445 | CONFIG_NFS_FS=y |
| 356 | CONFIG_NFS_V3=y | ||
| 357 | CONFIG_NFS_V4=y | 446 | CONFIG_NFS_V4=y |
| 447 | CONFIG_NFS_SWAP=y | ||
| 358 | CONFIG_ROOT_NFS=y | 448 | CONFIG_ROOT_NFS=y |
| 359 | CONFIG_NFSD=m | 449 | CONFIG_NFSD=m |
| 360 | CONFIG_NFSD_V3=y | 450 | CONFIG_NFSD_V3=y |
| 361 | CONFIG_SMB_FS=m | 451 | CONFIG_CIFS=m |
| 362 | CONFIG_SMB_NLS_DEFAULT=y | 452 | # CONFIG_CIFS_DEBUG is not set |
| 363 | CONFIG_CODA_FS=m | 453 | CONFIG_CODA_FS=m |
| 364 | CONFIG_NLS_CODEPAGE_437=y | 454 | CONFIG_NLS_CODEPAGE_437=y |
| 365 | CONFIG_NLS_CODEPAGE_737=m | 455 | CONFIG_NLS_CODEPAGE_737=m |
| @@ -398,10 +488,23 @@ CONFIG_NLS_ISO8859_14=m | |||
| 398 | CONFIG_NLS_ISO8859_15=m | 488 | CONFIG_NLS_ISO8859_15=m |
| 399 | CONFIG_NLS_KOI8_R=m | 489 | CONFIG_NLS_KOI8_R=m |
| 400 | CONFIG_NLS_KOI8_U=m | 490 | CONFIG_NLS_KOI8_U=m |
| 491 | CONFIG_NLS_MAC_ROMAN=m | ||
| 492 | CONFIG_NLS_MAC_CELTIC=m | ||
| 493 | CONFIG_NLS_MAC_CENTEURO=m | ||
| 494 | CONFIG_NLS_MAC_CROATIAN=m | ||
| 495 | CONFIG_NLS_MAC_CYRILLIC=m | ||
| 496 | CONFIG_NLS_MAC_GAELIC=m | ||
| 497 | CONFIG_NLS_MAC_GREEK=m | ||
| 498 | CONFIG_NLS_MAC_ICELAND=m | ||
| 499 | CONFIG_NLS_MAC_INUIT=m | ||
| 500 | CONFIG_NLS_MAC_ROMANIAN=m | ||
| 501 | CONFIG_NLS_MAC_TURKISH=m | ||
| 401 | CONFIG_DLM=m | 502 | CONFIG_DLM=m |
| 402 | CONFIG_MAGIC_SYSRQ=y | 503 | CONFIG_MAGIC_SYSRQ=y |
| 403 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 504 | CONFIG_ASYNC_RAID6_TEST=m |
| 404 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 505 | CONFIG_ENCRYPTED_KEYS=m |
| 506 | CONFIG_CRYPTO_MANAGER=y | ||
| 507 | CONFIG_CRYPTO_USER=m | ||
| 405 | CONFIG_CRYPTO_NULL=m | 508 | CONFIG_CRYPTO_NULL=m |
| 406 | CONFIG_CRYPTO_CRYPTD=m | 509 | CONFIG_CRYPTO_CRYPTD=m |
| 407 | CONFIG_CRYPTO_TEST=m | 510 | CONFIG_CRYPTO_TEST=m |
| @@ -411,19 +514,16 @@ CONFIG_CRYPTO_CTS=m | |||
| 411 | CONFIG_CRYPTO_LRW=m | 514 | CONFIG_CRYPTO_LRW=m |
| 412 | CONFIG_CRYPTO_PCBC=m | 515 | CONFIG_CRYPTO_PCBC=m |
| 413 | CONFIG_CRYPTO_XTS=m | 516 | CONFIG_CRYPTO_XTS=m |
| 414 | CONFIG_CRYPTO_HMAC=y | ||
| 415 | CONFIG_CRYPTO_XCBC=m | 517 | CONFIG_CRYPTO_XCBC=m |
| 416 | CONFIG_CRYPTO_MD4=m | 518 | CONFIG_CRYPTO_VMAC=m |
| 417 | CONFIG_CRYPTO_MICHAEL_MIC=m | 519 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 418 | CONFIG_CRYPTO_RMD128=m | 520 | CONFIG_CRYPTO_RMD128=m |
| 419 | CONFIG_CRYPTO_RMD160=m | 521 | CONFIG_CRYPTO_RMD160=m |
| 420 | CONFIG_CRYPTO_RMD256=m | 522 | CONFIG_CRYPTO_RMD256=m |
| 421 | CONFIG_CRYPTO_RMD320=m | 523 | CONFIG_CRYPTO_RMD320=m |
| 422 | CONFIG_CRYPTO_SHA256=m | ||
| 423 | CONFIG_CRYPTO_SHA512=m | 524 | CONFIG_CRYPTO_SHA512=m |
| 424 | CONFIG_CRYPTO_TGR192=m | 525 | CONFIG_CRYPTO_TGR192=m |
| 425 | CONFIG_CRYPTO_WP512=m | 526 | CONFIG_CRYPTO_WP512=m |
| 426 | CONFIG_CRYPTO_AES=m | ||
| 427 | CONFIG_CRYPTO_ANUBIS=m | 527 | CONFIG_CRYPTO_ANUBIS=m |
| 428 | CONFIG_CRYPTO_BLOWFISH=m | 528 | CONFIG_CRYPTO_BLOWFISH=m |
| 429 | CONFIG_CRYPTO_CAMELLIA=m | 529 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -439,6 +539,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
| 439 | CONFIG_CRYPTO_ZLIB=m | 539 | CONFIG_CRYPTO_ZLIB=m |
| 440 | CONFIG_CRYPTO_LZO=m | 540 | CONFIG_CRYPTO_LZO=m |
| 441 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 541 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 542 | CONFIG_CRYPTO_USER_API_HASH=m | ||
| 543 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
| 442 | # CONFIG_CRYPTO_HW is not set | 544 | # CONFIG_CRYPTO_HW is not set |
| 443 | CONFIG_CRC16=y | ||
| 444 | CONFIG_CRC_T10DIF=y | 545 | CONFIG_CRC_T10DIF=y |
| 546 | CONFIG_XZ_DEC_X86=y | ||
| 547 | CONFIG_XZ_DEC_POWERPC=y | ||
| 548 | CONFIG_XZ_DEC_IA64=y | ||
| 549 | CONFIG_XZ_DEC_ARM=y | ||
| 550 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
| 551 | CONFIG_XZ_DEC_SPARC=y | ||
| 552 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index e2af46f530c1..5586c6529fce 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig | |||
| @@ -1,52 +1,73 @@ | |||
| 1 | CONFIG_EXPERIMENTAL=y | ||
| 2 | CONFIG_LOCALVERSION="-mvme147" | 1 | CONFIG_LOCALVERSION="-mvme147" |
| 3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
| 4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
| 4 | CONFIG_FHANDLE=y | ||
| 5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
| 6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
| 7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
| 8 | # CONFIG_UTS_NS is not set | ||
| 9 | # CONFIG_IPC_NS is not set | ||
| 10 | # CONFIG_PID_NS is not set | ||
| 11 | # CONFIG_NET_NS is not set | ||
| 8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
| 9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
| 11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
| 12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
| 16 | CONFIG_PARTITION_ADVANCED=y | ||
| 17 | CONFIG_AMIGA_PARTITION=y | ||
| 18 | CONFIG_ATARI_PARTITION=y | ||
| 19 | CONFIG_MAC_PARTITION=y | ||
| 20 | CONFIG_BSD_DISKLABEL=y | ||
| 21 | CONFIG_MINIX_SUBPARTITION=y | ||
| 22 | CONFIG_SOLARIS_X86_PARTITION=y | ||
| 23 | CONFIG_UNIXWARE_DISKLABEL=y | ||
| 24 | CONFIG_SUN_PARTITION=y | ||
| 25 | # CONFIG_EFI_PARTITION is not set | ||
| 26 | CONFIG_IOSCHED_DEADLINE=m | ||
| 27 | CONFIG_M68030=y | ||
| 13 | CONFIG_VME=y | 28 | CONFIG_VME=y |
| 14 | CONFIG_MVME147=y | 29 | CONFIG_MVME147=y |
| 15 | CONFIG_M68030=y | 30 | # CONFIG_COMPACTION is not set |
| 31 | CONFIG_CLEANCACHE=y | ||
| 32 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 16 | CONFIG_BINFMT_AOUT=m | 33 | CONFIG_BINFMT_AOUT=m |
| 17 | CONFIG_BINFMT_MISC=m | 34 | CONFIG_BINFMT_MISC=m |
| 18 | CONFIG_PROC_HARDWARE=y | ||
| 19 | CONFIG_NET=y | 35 | CONFIG_NET=y |
| 20 | CONFIG_PACKET=y | 36 | CONFIG_PACKET=y |
| 37 | CONFIG_PACKET_DIAG=m | ||
| 21 | CONFIG_UNIX=y | 38 | CONFIG_UNIX=y |
| 39 | CONFIG_UNIX_DIAG=m | ||
| 40 | CONFIG_XFRM_MIGRATE=y | ||
| 22 | CONFIG_NET_KEY=y | 41 | CONFIG_NET_KEY=y |
| 23 | CONFIG_NET_KEY_MIGRATE=y | ||
| 24 | CONFIG_INET=y | 42 | CONFIG_INET=y |
| 25 | CONFIG_IP_PNP=y | 43 | CONFIG_IP_PNP=y |
| 26 | CONFIG_IP_PNP_DHCP=y | 44 | CONFIG_IP_PNP_DHCP=y |
| 27 | CONFIG_IP_PNP_BOOTP=y | 45 | CONFIG_IP_PNP_BOOTP=y |
| 28 | CONFIG_IP_PNP_RARP=y | 46 | CONFIG_IP_PNP_RARP=y |
| 29 | CONFIG_NET_IPIP=m | 47 | CONFIG_NET_IPIP=m |
| 48 | CONFIG_NET_IPGRE_DEMUX=m | ||
| 30 | CONFIG_NET_IPGRE=m | 49 | CONFIG_NET_IPGRE=m |
| 31 | CONFIG_SYN_COOKIES=y | 50 | CONFIG_SYN_COOKIES=y |
| 51 | CONFIG_NET_IPVTI=m | ||
| 32 | CONFIG_INET_AH=m | 52 | CONFIG_INET_AH=m |
| 33 | CONFIG_INET_ESP=m | 53 | CONFIG_INET_ESP=m |
| 34 | CONFIG_INET_IPCOMP=m | 54 | CONFIG_INET_IPCOMP=m |
| 35 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 55 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 36 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 56 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 37 | CONFIG_INET_XFRM_MODE_BEET=m | 57 | CONFIG_INET_XFRM_MODE_BEET=m |
| 58 | # CONFIG_INET_LRO is not set | ||
| 38 | CONFIG_INET_DIAG=m | 59 | CONFIG_INET_DIAG=m |
| 60 | CONFIG_INET_UDP_DIAG=m | ||
| 39 | CONFIG_IPV6_PRIVACY=y | 61 | CONFIG_IPV6_PRIVACY=y |
| 40 | CONFIG_IPV6_ROUTER_PREF=y | 62 | CONFIG_IPV6_ROUTER_PREF=y |
| 41 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 42 | CONFIG_INET6_AH=m | 63 | CONFIG_INET6_AH=m |
| 43 | CONFIG_INET6_ESP=m | 64 | CONFIG_INET6_ESP=m |
| 44 | CONFIG_INET6_IPCOMP=m | 65 | CONFIG_INET6_IPCOMP=m |
| 45 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 66 | CONFIG_IPV6_GRE=m |
| 46 | CONFIG_IPV6_TUNNEL=m | ||
| 47 | CONFIG_NETFILTER=y | 67 | CONFIG_NETFILTER=y |
| 48 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
| 49 | CONFIG_NF_CONNTRACK=m | 68 | CONFIG_NF_CONNTRACK=m |
| 69 | CONFIG_NF_CONNTRACK_ZONES=y | ||
| 70 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
| 50 | # CONFIG_NF_CT_PROTO_DCCP is not set | 71 | # CONFIG_NF_CT_PROTO_DCCP is not set |
| 51 | CONFIG_NF_CT_PROTO_UDPLITE=m | 72 | CONFIG_NF_CT_PROTO_UDPLITE=m |
| 52 | CONFIG_NF_CONNTRACK_AMANDA=m | 73 | CONFIG_NF_CONNTRACK_AMANDA=m |
| @@ -54,25 +75,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
| 54 | CONFIG_NF_CONNTRACK_H323=m | 75 | CONFIG_NF_CONNTRACK_H323=m |
| 55 | CONFIG_NF_CONNTRACK_IRC=m | 76 | CONFIG_NF_CONNTRACK_IRC=m |
| 56 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 77 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
| 78 | CONFIG_NF_CONNTRACK_SNMP=m | ||
| 57 | CONFIG_NF_CONNTRACK_PPTP=m | 79 | CONFIG_NF_CONNTRACK_PPTP=m |
| 58 | CONFIG_NF_CONNTRACK_SANE=m | 80 | CONFIG_NF_CONNTRACK_SANE=m |
| 59 | CONFIG_NF_CONNTRACK_SIP=m | 81 | CONFIG_NF_CONNTRACK_SIP=m |
| 60 | CONFIG_NF_CONNTRACK_TFTP=m | 82 | CONFIG_NF_CONNTRACK_TFTP=m |
| 83 | CONFIG_NETFILTER_XT_SET=m | ||
| 84 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
| 61 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 85 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 62 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 86 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 63 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 87 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 88 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
| 89 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
| 90 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
| 64 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 91 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 65 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 92 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 66 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 93 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 94 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
| 95 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
| 67 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 96 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 68 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 97 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 69 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 98 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 99 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
| 100 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
| 70 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 101 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
| 71 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 102 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 72 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 103 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 104 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
| 73 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 105 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| 74 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 106 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 75 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 107 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 108 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
| 76 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 109 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 77 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 110 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 78 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 111 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| @@ -83,6 +116,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
| 83 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 116 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 84 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 117 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 85 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 118 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
| 119 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
| 120 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
| 86 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 121 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 87 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 122 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 88 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 123 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| @@ -96,22 +131,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 96 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 131 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 97 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 132 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 98 | CONFIG_NETFILTER_XT_MATCH_U32=m | 133 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 134 | CONFIG_IP_SET=m | ||
| 135 | CONFIG_IP_SET_BITMAP_IP=m | ||
| 136 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
| 137 | CONFIG_IP_SET_BITMAP_PORT=m | ||
| 138 | CONFIG_IP_SET_HASH_IP=m | ||
| 139 | CONFIG_IP_SET_HASH_IPPORT=m | ||
| 140 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
| 141 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
| 142 | CONFIG_IP_SET_HASH_NET=m | ||
| 143 | CONFIG_IP_SET_HASH_NETPORT=m | ||
| 144 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
| 145 | CONFIG_IP_SET_LIST_SET=m | ||
| 99 | CONFIG_NF_CONNTRACK_IPV4=m | 146 | CONFIG_NF_CONNTRACK_IPV4=m |
| 100 | CONFIG_IP_NF_QUEUE=m | ||
| 101 | CONFIG_IP_NF_IPTABLES=m | 147 | CONFIG_IP_NF_IPTABLES=m |
| 102 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 103 | CONFIG_IP_NF_MATCH_AH=m | 148 | CONFIG_IP_NF_MATCH_AH=m |
| 104 | CONFIG_IP_NF_MATCH_ECN=m | 149 | CONFIG_IP_NF_MATCH_ECN=m |
| 150 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
| 105 | CONFIG_IP_NF_MATCH_TTL=m | 151 | CONFIG_IP_NF_MATCH_TTL=m |
| 106 | CONFIG_IP_NF_FILTER=m | 152 | CONFIG_IP_NF_FILTER=m |
| 107 | CONFIG_IP_NF_TARGET_REJECT=m | 153 | CONFIG_IP_NF_TARGET_REJECT=m |
| 108 | CONFIG_IP_NF_TARGET_LOG=m | ||
| 109 | CONFIG_IP_NF_TARGET_ULOG=m | 154 | CONFIG_IP_NF_TARGET_ULOG=m |
| 110 | CONFIG_NF_NAT=m | 155 | CONFIG_NF_NAT_IPV4=m |
| 111 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 156 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 112 | CONFIG_IP_NF_TARGET_NETMAP=m | 157 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 113 | CONFIG_IP_NF_TARGET_REDIRECT=m | 158 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 114 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
| 115 | CONFIG_IP_NF_MANGLE=m | 159 | CONFIG_IP_NF_MANGLE=m |
| 116 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 160 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
| 117 | CONFIG_IP_NF_TARGET_ECN=m | 161 | CONFIG_IP_NF_TARGET_ECN=m |
| @@ -121,7 +165,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
| 121 | CONFIG_IP_NF_ARPFILTER=m | 165 | CONFIG_IP_NF_ARPFILTER=m |
| 122 | CONFIG_IP_NF_ARP_MANGLE=m | 166 | CONFIG_IP_NF_ARP_MANGLE=m |
| 123 | CONFIG_NF_CONNTRACK_IPV6=m | 167 | CONFIG_NF_CONNTRACK_IPV6=m |
| 124 | CONFIG_IP6_NF_QUEUE=m | ||
| 125 | CONFIG_IP6_NF_IPTABLES=m | 168 | CONFIG_IP6_NF_IPTABLES=m |
| 126 | CONFIG_IP6_NF_MATCH_AH=m | 169 | CONFIG_IP6_NF_MATCH_AH=m |
| 127 | CONFIG_IP6_NF_MATCH_EUI64=m | 170 | CONFIG_IP6_NF_MATCH_EUI64=m |
| @@ -130,21 +173,34 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
| 130 | CONFIG_IP6_NF_MATCH_HL=m | 173 | CONFIG_IP6_NF_MATCH_HL=m |
| 131 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 174 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 132 | CONFIG_IP6_NF_MATCH_MH=m | 175 | CONFIG_IP6_NF_MATCH_MH=m |
| 176 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
| 133 | CONFIG_IP6_NF_MATCH_RT=m | 177 | CONFIG_IP6_NF_MATCH_RT=m |
| 134 | CONFIG_IP6_NF_TARGET_HL=m | 178 | CONFIG_IP6_NF_TARGET_HL=m |
| 135 | CONFIG_IP6_NF_TARGET_LOG=m | ||
| 136 | CONFIG_IP6_NF_FILTER=m | 179 | CONFIG_IP6_NF_FILTER=m |
| 137 | CONFIG_IP6_NF_TARGET_REJECT=m | 180 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 138 | CONFIG_IP6_NF_MANGLE=m | 181 | CONFIG_IP6_NF_MANGLE=m |
| 139 | CONFIG_IP6_NF_RAW=m | 182 | CONFIG_IP6_NF_RAW=m |
| 183 | CONFIG_NF_NAT_IPV6=m | ||
| 184 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
| 185 | CONFIG_IP6_NF_TARGET_NPT=m | ||
| 140 | CONFIG_IP_DCCP=m | 186 | CONFIG_IP_DCCP=m |
| 141 | # CONFIG_IP_DCCP_CCID3 is not set | 187 | # CONFIG_IP_DCCP_CCID3 is not set |
| 188 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
| 189 | CONFIG_RDS=m | ||
| 190 | CONFIG_RDS_TCP=m | ||
| 191 | CONFIG_L2TP=m | ||
| 142 | CONFIG_ATALK=m | 192 | CONFIG_ATALK=m |
| 193 | CONFIG_BATMAN_ADV=m | ||
| 194 | CONFIG_BATMAN_ADV_DAT=y | ||
| 195 | # CONFIG_WIRELESS is not set | ||
| 143 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 196 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 197 | CONFIG_DEVTMPFS=y | ||
| 144 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 198 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
| 199 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
| 145 | CONFIG_CONNECTOR=m | 200 | CONFIG_CONNECTOR=m |
| 146 | CONFIG_BLK_DEV_LOOP=y | 201 | CONFIG_BLK_DEV_LOOP=y |
| 147 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 202 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
| 203 | CONFIG_BLK_DEV_DRBD=m | ||
| 148 | CONFIG_BLK_DEV_NBD=m | 204 | CONFIG_BLK_DEV_NBD=m |
| 149 | CONFIG_BLK_DEV_RAM=y | 205 | CONFIG_BLK_DEV_RAM=y |
| 150 | CONFIG_CDROM_PKTCDVD=m | 206 | CONFIG_CDROM_PKTCDVD=m |
| @@ -159,103 +215,132 @@ CONFIG_BLK_DEV_SR=y | |||
| 159 | CONFIG_BLK_DEV_SR_VENDOR=y | 215 | CONFIG_BLK_DEV_SR_VENDOR=y |
| 160 | CONFIG_CHR_DEV_SG=m | 216 | CONFIG_CHR_DEV_SG=m |
| 161 | CONFIG_SCSI_CONSTANTS=y | 217 | CONFIG_SCSI_CONSTANTS=y |
| 162 | CONFIG_SCSI_SAS_LIBSAS=m | 218 | CONFIG_SCSI_SAS_ATTRS=m |
| 163 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
| 164 | CONFIG_SCSI_SRP_ATTRS=m | ||
| 165 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
| 166 | CONFIG_ISCSI_TCP=m | 219 | CONFIG_ISCSI_TCP=m |
| 220 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
| 167 | CONFIG_MVME147_SCSI=y | 221 | CONFIG_MVME147_SCSI=y |
| 168 | CONFIG_MD=y | 222 | CONFIG_MD=y |
| 169 | CONFIG_BLK_DEV_MD=m | ||
| 170 | CONFIG_MD_LINEAR=m | 223 | CONFIG_MD_LINEAR=m |
| 171 | CONFIG_MD_RAID0=m | 224 | CONFIG_MD_RAID0=m |
| 172 | CONFIG_MD_RAID1=m | ||
| 173 | CONFIG_MD_RAID456=m | ||
| 174 | CONFIG_BLK_DEV_DM=m | 225 | CONFIG_BLK_DEV_DM=m |
| 175 | CONFIG_DM_CRYPT=m | 226 | CONFIG_DM_CRYPT=m |
| 176 | CONFIG_DM_SNAPSHOT=m | 227 | CONFIG_DM_SNAPSHOT=m |
| 228 | CONFIG_DM_THIN_PROVISIONING=m | ||
| 229 | CONFIG_DM_CACHE=m | ||
| 177 | CONFIG_DM_MIRROR=m | 230 | CONFIG_DM_MIRROR=m |
| 231 | CONFIG_DM_RAID=m | ||
| 178 | CONFIG_DM_ZERO=m | 232 | CONFIG_DM_ZERO=m |
| 179 | CONFIG_DM_MULTIPATH=m | 233 | CONFIG_DM_MULTIPATH=m |
| 180 | CONFIG_DM_UEVENT=y | 234 | CONFIG_DM_UEVENT=y |
| 235 | CONFIG_TARGET_CORE=m | ||
| 236 | CONFIG_TCM_IBLOCK=m | ||
| 237 | CONFIG_TCM_FILEIO=m | ||
| 238 | CONFIG_TCM_PSCSI=m | ||
| 181 | CONFIG_NETDEVICES=y | 239 | CONFIG_NETDEVICES=y |
| 182 | CONFIG_DUMMY=m | 240 | CONFIG_DUMMY=m |
| 183 | CONFIG_MACVLAN=m | ||
| 184 | CONFIG_EQUALIZER=m | 241 | CONFIG_EQUALIZER=m |
| 242 | CONFIG_NET_TEAM=m | ||
| 243 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
| 244 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
| 245 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
| 246 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
| 247 | CONFIG_VXLAN=m | ||
| 248 | CONFIG_NETCONSOLE=m | ||
| 249 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
| 185 | CONFIG_VETH=m | 250 | CONFIG_VETH=m |
| 186 | CONFIG_NET_ETHERNET=y | ||
| 187 | CONFIG_MVME147_NET=y | 251 | CONFIG_MVME147_NET=y |
| 188 | # CONFIG_NETDEV_1000 is not set | 252 | # CONFIG_NET_CADENCE is not set |
| 189 | # CONFIG_NETDEV_10000 is not set | 253 | # CONFIG_NET_VENDOR_BROADCOM is not set |
| 254 | # CONFIG_NET_VENDOR_INTEL is not set | ||
| 255 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
| 256 | # CONFIG_NET_VENDOR_MICREL is not set | ||
| 257 | # CONFIG_NET_VENDOR_NATSEMI is not set | ||
| 258 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
| 259 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
| 260 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
| 190 | CONFIG_PPP=m | 261 | CONFIG_PPP=m |
| 191 | CONFIG_PPP_FILTER=y | ||
| 192 | CONFIG_PPP_ASYNC=m | ||
| 193 | CONFIG_PPP_SYNC_TTY=m | ||
| 194 | CONFIG_PPP_DEFLATE=m | ||
| 195 | CONFIG_PPP_BSDCOMP=m | 262 | CONFIG_PPP_BSDCOMP=m |
| 263 | CONFIG_PPP_DEFLATE=m | ||
| 264 | CONFIG_PPP_FILTER=y | ||
| 196 | CONFIG_PPP_MPPE=m | 265 | CONFIG_PPP_MPPE=m |
| 197 | CONFIG_PPPOE=m | 266 | CONFIG_PPPOE=m |
| 267 | CONFIG_PPTP=m | ||
| 268 | CONFIG_PPPOL2TP=m | ||
| 269 | CONFIG_PPP_ASYNC=m | ||
| 270 | CONFIG_PPP_SYNC_TTY=m | ||
| 198 | CONFIG_SLIP=m | 271 | CONFIG_SLIP=m |
| 199 | CONFIG_SLIP_COMPRESSED=y | 272 | CONFIG_SLIP_COMPRESSED=y |
| 200 | CONFIG_SLIP_SMART=y | 273 | CONFIG_SLIP_SMART=y |
| 201 | CONFIG_SLIP_MODE_SLIP6=y | 274 | CONFIG_SLIP_MODE_SLIP6=y |
| 202 | CONFIG_NETCONSOLE=m | 275 | # CONFIG_WLAN is not set |
| 203 | CONFIG_NETCONSOLE_DYNAMIC=y | 276 | CONFIG_INPUT_EVDEV=m |
| 204 | CONFIG_INPUT_FF_MEMLESS=m | ||
| 205 | # CONFIG_KEYBOARD_ATKBD is not set | 277 | # CONFIG_KEYBOARD_ATKBD is not set |
| 206 | CONFIG_MOUSE_PS2=m | 278 | # CONFIG_MOUSE_PS2 is not set |
| 207 | CONFIG_MOUSE_SERIAL=m | 279 | # CONFIG_SERIO is not set |
| 208 | CONFIG_SERIO=m | ||
| 209 | # CONFIG_SERIO_SERPORT is not set | ||
| 210 | CONFIG_VT_HW_CONSOLE_BINDING=y | 280 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 281 | # CONFIG_LEGACY_PTYS is not set | ||
| 211 | # CONFIG_DEVKMEM is not set | 282 | # CONFIG_DEVKMEM is not set |
| 212 | # CONFIG_HW_RANDOM is not set | 283 | # CONFIG_HW_RANDOM is not set |
| 213 | CONFIG_GEN_RTC=m | 284 | CONFIG_NTP_PPS=y |
| 214 | CONFIG_GEN_RTC_X=y | 285 | CONFIG_PPS_CLIENT_LDISC=m |
| 286 | CONFIG_PTP_1588_CLOCK=m | ||
| 215 | # CONFIG_HWMON is not set | 287 | # CONFIG_HWMON is not set |
| 216 | CONFIG_HID=m | 288 | CONFIG_HID=m |
| 217 | CONFIG_HIDRAW=y | 289 | CONFIG_HIDRAW=y |
| 290 | CONFIG_UHID=m | ||
| 291 | # CONFIG_HID_GENERIC is not set | ||
| 218 | # CONFIG_USB_SUPPORT is not set | 292 | # CONFIG_USB_SUPPORT is not set |
| 293 | CONFIG_RTC_CLASS=y | ||
| 294 | CONFIG_RTC_DRV_GENERIC=m | ||
| 295 | # CONFIG_IOMMU_SUPPORT is not set | ||
| 296 | CONFIG_PROC_HARDWARE=y | ||
| 219 | CONFIG_EXT2_FS=y | 297 | CONFIG_EXT2_FS=y |
| 220 | CONFIG_EXT3_FS=y | 298 | CONFIG_EXT3_FS=y |
| 221 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 299 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
| 222 | # CONFIG_EXT3_FS_XATTR is not set | 300 | # CONFIG_EXT3_FS_XATTR is not set |
| 301 | CONFIG_EXT4_FS=y | ||
| 223 | CONFIG_REISERFS_FS=m | 302 | CONFIG_REISERFS_FS=m |
| 224 | CONFIG_JFS_FS=m | 303 | CONFIG_JFS_FS=m |
| 225 | CONFIG_XFS_FS=m | 304 | CONFIG_XFS_FS=m |
| 226 | CONFIG_OCFS2_FS=m | 305 | CONFIG_OCFS2_FS=m |
| 227 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 228 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 306 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 307 | CONFIG_FANOTIFY=y | ||
| 229 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 308 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 230 | # CONFIG_PRINT_QUOTA_WARNING is not set | 309 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 231 | CONFIG_AUTOFS_FS=m | ||
| 232 | CONFIG_AUTOFS4_FS=m | 310 | CONFIG_AUTOFS4_FS=m |
| 233 | CONFIG_FUSE_FS=m | 311 | CONFIG_FUSE_FS=m |
| 312 | CONFIG_CUSE=m | ||
| 234 | CONFIG_ISO9660_FS=y | 313 | CONFIG_ISO9660_FS=y |
| 235 | CONFIG_JOLIET=y | 314 | CONFIG_JOLIET=y |
| 236 | CONFIG_ZISOFS=y | 315 | CONFIG_ZISOFS=y |
| 237 | CONFIG_UDF_FS=m | 316 | CONFIG_UDF_FS=m |
| 238 | CONFIG_MSDOS_FS=y | 317 | CONFIG_MSDOS_FS=m |
| 239 | CONFIG_VFAT_FS=m | 318 | CONFIG_VFAT_FS=m |
| 240 | CONFIG_PROC_KCORE=y | 319 | CONFIG_PROC_KCORE=y |
| 241 | CONFIG_TMPFS=y | 320 | CONFIG_TMPFS=y |
| 242 | CONFIG_AFFS_FS=m | 321 | CONFIG_AFFS_FS=m |
| 322 | CONFIG_ECRYPT_FS=m | ||
| 323 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
| 243 | CONFIG_HFS_FS=m | 324 | CONFIG_HFS_FS=m |
| 244 | CONFIG_HFSPLUS_FS=m | 325 | CONFIG_HFSPLUS_FS=m |
| 245 | CONFIG_CRAMFS=m | 326 | CONFIG_CRAMFS=m |
| 246 | CONFIG_SQUASHFS=m | 327 | CONFIG_SQUASHFS=m |
| 247 | CONFIG_MINIX_FS=y | 328 | CONFIG_SQUASHFS_LZO=y |
| 329 | CONFIG_MINIX_FS=m | ||
| 330 | CONFIG_OMFS_FS=m | ||
| 248 | CONFIG_HPFS_FS=m | 331 | CONFIG_HPFS_FS=m |
| 332 | CONFIG_QNX4FS_FS=m | ||
| 333 | CONFIG_QNX6FS_FS=m | ||
| 249 | CONFIG_SYSV_FS=m | 334 | CONFIG_SYSV_FS=m |
| 250 | CONFIG_UFS_FS=m | 335 | CONFIG_UFS_FS=m |
| 251 | CONFIG_NFS_FS=y | 336 | CONFIG_NFS_FS=y |
| 252 | CONFIG_NFS_V3=y | ||
| 253 | CONFIG_NFS_V4=y | 337 | CONFIG_NFS_V4=y |
| 338 | CONFIG_NFS_SWAP=y | ||
| 254 | CONFIG_ROOT_NFS=y | 339 | CONFIG_ROOT_NFS=y |
| 255 | CONFIG_NFSD=m | 340 | CONFIG_NFSD=m |
| 256 | CONFIG_NFSD_V3=y | 341 | CONFIG_NFSD_V3=y |
| 257 | CONFIG_SMB_FS=m | 342 | CONFIG_CIFS=m |
| 258 | CONFIG_SMB_NLS_DEFAULT=y | 343 | # CONFIG_CIFS_DEBUG is not set |
| 259 | CONFIG_CODA_FS=m | 344 | CONFIG_CODA_FS=m |
| 260 | CONFIG_NLS_CODEPAGE_437=y | 345 | CONFIG_NLS_CODEPAGE_437=y |
| 261 | CONFIG_NLS_CODEPAGE_737=m | 346 | CONFIG_NLS_CODEPAGE_737=m |
| @@ -294,10 +379,23 @@ CONFIG_NLS_ISO8859_14=m | |||
| 294 | CONFIG_NLS_ISO8859_15=m | 379 | CONFIG_NLS_ISO8859_15=m |
| 295 | CONFIG_NLS_KOI8_R=m | 380 | CONFIG_NLS_KOI8_R=m |
| 296 | CONFIG_NLS_KOI8_U=m | 381 | CONFIG_NLS_KOI8_U=m |
| 382 | CONFIG_NLS_MAC_ROMAN=m | ||
| 383 | CONFIG_NLS_MAC_CELTIC=m | ||
| 384 | CONFIG_NLS_MAC_CENTEURO=m | ||
| 385 | CONFIG_NLS_MAC_CROATIAN=m | ||
| 386 | CONFIG_NLS_MAC_CYRILLIC=m | ||
| 387 | CONFIG_NLS_MAC_GAELIC=m | ||
| 388 | CONFIG_NLS_MAC_GREEK=m | ||
| 389 | CONFIG_NLS_MAC_ICELAND=m | ||
| 390 | CONFIG_NLS_MAC_INUIT=m | ||
| 391 | CONFIG_NLS_MAC_ROMANIAN=m | ||
| 392 | CONFIG_NLS_MAC_TURKISH=m | ||
| 297 | CONFIG_DLM=m | 393 | CONFIG_DLM=m |
| 298 | CONFIG_MAGIC_SYSRQ=y | 394 | CONFIG_MAGIC_SYSRQ=y |
| 299 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 395 | CONFIG_ASYNC_RAID6_TEST=m |
| 300 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 396 | CONFIG_ENCRYPTED_KEYS=m |
| 397 | CONFIG_CRYPTO_MANAGER=y | ||
| 398 | CONFIG_CRYPTO_USER=m | ||
| 301 | CONFIG_CRYPTO_NULL=m | 399 | CONFIG_CRYPTO_NULL=m |
| 302 | CONFIG_CRYPTO_CRYPTD=m | 400 | CONFIG_CRYPTO_CRYPTD=m |
| 303 | CONFIG_CRYPTO_TEST=m | 401 | CONFIG_CRYPTO_TEST=m |
| @@ -307,19 +405,16 @@ CONFIG_CRYPTO_CTS=m | |||
| 307 | CONFIG_CRYPTO_LRW=m | 405 | CONFIG_CRYPTO_LRW=m |
| 308 | CONFIG_CRYPTO_PCBC=m | 406 | CONFIG_CRYPTO_PCBC=m |
| 309 | CONFIG_CRYPTO_XTS=m | 407 | CONFIG_CRYPTO_XTS=m |
| 310 | CONFIG_CRYPTO_HMAC=y | ||
| 311 | CONFIG_CRYPTO_XCBC=m | 408 | CONFIG_CRYPTO_XCBC=m |
| 312 | CONFIG_CRYPTO_MD4=m | 409 | CONFIG_CRYPTO_VMAC=m |
| 313 | CONFIG_CRYPTO_MICHAEL_MIC=m | 410 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 314 | CONFIG_CRYPTO_RMD128=m | 411 | CONFIG_CRYPTO_RMD128=m |
| 315 | CONFIG_CRYPTO_RMD160=m | 412 | CONFIG_CRYPTO_RMD160=m |
| 316 | CONFIG_CRYPTO_RMD256=m | 413 | CONFIG_CRYPTO_RMD256=m |
| 317 | CONFIG_CRYPTO_RMD320=m | 414 | CONFIG_CRYPTO_RMD320=m |
| 318 | CONFIG_CRYPTO_SHA256=m | ||
| 319 | CONFIG_CRYPTO_SHA512=m | 415 | CONFIG_CRYPTO_SHA512=m |
| 320 | CONFIG_CRYPTO_TGR192=m | 416 | CONFIG_CRYPTO_TGR192=m |
| 321 | CONFIG_CRYPTO_WP512=m | 417 | CONFIG_CRYPTO_WP512=m |
| 322 | CONFIG_CRYPTO_AES=m | ||
| 323 | CONFIG_CRYPTO_ANUBIS=m | 418 | CONFIG_CRYPTO_ANUBIS=m |
| 324 | CONFIG_CRYPTO_BLOWFISH=m | 419 | CONFIG_CRYPTO_BLOWFISH=m |
| 325 | CONFIG_CRYPTO_CAMELLIA=m | 420 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -335,6 +430,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
| 335 | CONFIG_CRYPTO_ZLIB=m | 430 | CONFIG_CRYPTO_ZLIB=m |
| 336 | CONFIG_CRYPTO_LZO=m | 431 | CONFIG_CRYPTO_LZO=m |
| 337 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 432 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 433 | CONFIG_CRYPTO_USER_API_HASH=m | ||
| 434 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
| 338 | # CONFIG_CRYPTO_HW is not set | 435 | # CONFIG_CRYPTO_HW is not set |
| 339 | CONFIG_CRC16=m | ||
| 340 | CONFIG_CRC_T10DIF=y | 436 | CONFIG_CRC_T10DIF=y |
| 437 | CONFIG_XZ_DEC_X86=y | ||
| 438 | CONFIG_XZ_DEC_POWERPC=y | ||
| 439 | CONFIG_XZ_DEC_IA64=y | ||
| 440 | CONFIG_XZ_DEC_ARM=y | ||
| 441 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
| 442 | CONFIG_XZ_DEC_SPARC=y | ||
| 443 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index 7c9402b2097f..e5e8262bbacd 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig | |||
| @@ -1,53 +1,74 @@ | |||
| 1 | CONFIG_EXPERIMENTAL=y | ||
| 2 | CONFIG_LOCALVERSION="-mvme16x" | 1 | CONFIG_LOCALVERSION="-mvme16x" |
| 3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
| 4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
| 4 | CONFIG_FHANDLE=y | ||
| 5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
| 6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
| 7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
| 8 | # CONFIG_UTS_NS is not set | ||
| 9 | # CONFIG_IPC_NS is not set | ||
| 10 | # CONFIG_PID_NS is not set | ||
| 11 | # CONFIG_NET_NS is not set | ||
| 8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
| 9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
| 11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
| 12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
| 13 | CONFIG_VME=y | 16 | CONFIG_PARTITION_ADVANCED=y |
| 14 | CONFIG_MVME16x=y | 17 | CONFIG_AMIGA_PARTITION=y |
| 18 | CONFIG_ATARI_PARTITION=y | ||
| 19 | CONFIG_MAC_PARTITION=y | ||
| 20 | CONFIG_BSD_DISKLABEL=y | ||
| 21 | CONFIG_MINIX_SUBPARTITION=y | ||
| 22 | CONFIG_SOLARIS_X86_PARTITION=y | ||
| 23 | CONFIG_UNIXWARE_DISKLABEL=y | ||
| 24 | CONFIG_SUN_PARTITION=y | ||
| 25 | # CONFIG_EFI_PARTITION is not set | ||
| 26 | CONFIG_IOSCHED_DEADLINE=m | ||
| 15 | CONFIG_M68040=y | 27 | CONFIG_M68040=y |
| 16 | CONFIG_M68060=y | 28 | CONFIG_M68060=y |
| 29 | CONFIG_VME=y | ||
| 30 | CONFIG_MVME16x=y | ||
| 31 | # CONFIG_COMPACTION is not set | ||
| 32 | CONFIG_CLEANCACHE=y | ||
| 33 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 17 | CONFIG_BINFMT_AOUT=m | 34 | CONFIG_BINFMT_AOUT=m |
| 18 | CONFIG_BINFMT_MISC=m | 35 | CONFIG_BINFMT_MISC=m |
| 19 | CONFIG_PROC_HARDWARE=y | ||
| 20 | CONFIG_NET=y | 36 | CONFIG_NET=y |
| 21 | CONFIG_PACKET=y | 37 | CONFIG_PACKET=y |
| 38 | CONFIG_PACKET_DIAG=m | ||
| 22 | CONFIG_UNIX=y | 39 | CONFIG_UNIX=y |
| 40 | CONFIG_UNIX_DIAG=m | ||
| 41 | CONFIG_XFRM_MIGRATE=y | ||
| 23 | CONFIG_NET_KEY=y | 42 | CONFIG_NET_KEY=y |
| 24 | CONFIG_NET_KEY_MIGRATE=y | ||
| 25 | CONFIG_INET=y | 43 | CONFIG_INET=y |
| 26 | CONFIG_IP_PNP=y | 44 | CONFIG_IP_PNP=y |
| 27 | CONFIG_IP_PNP_DHCP=y | 45 | CONFIG_IP_PNP_DHCP=y |
| 28 | CONFIG_IP_PNP_BOOTP=y | 46 | CONFIG_IP_PNP_BOOTP=y |
| 29 | CONFIG_IP_PNP_RARP=y | 47 | CONFIG_IP_PNP_RARP=y |
| 30 | CONFIG_NET_IPIP=m | 48 | CONFIG_NET_IPIP=m |
| 49 | CONFIG_NET_IPGRE_DEMUX=m | ||
| 31 | CONFIG_NET_IPGRE=m | 50 | CONFIG_NET_IPGRE=m |
| 32 | CONFIG_SYN_COOKIES=y | 51 | CONFIG_SYN_COOKIES=y |
| 52 | CONFIG_NET_IPVTI=m | ||
| 33 | CONFIG_INET_AH=m | 53 | CONFIG_INET_AH=m |
| 34 | CONFIG_INET_ESP=m | 54 | CONFIG_INET_ESP=m |
| 35 | CONFIG_INET_IPCOMP=m | 55 | CONFIG_INET_IPCOMP=m |
| 36 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 56 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 37 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 57 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 38 | CONFIG_INET_XFRM_MODE_BEET=m | 58 | CONFIG_INET_XFRM_MODE_BEET=m |
| 59 | # CONFIG_INET_LRO is not set | ||
| 39 | CONFIG_INET_DIAG=m | 60 | CONFIG_INET_DIAG=m |
| 61 | CONFIG_INET_UDP_DIAG=m | ||
| 40 | CONFIG_IPV6_PRIVACY=y | 62 | CONFIG_IPV6_PRIVACY=y |
| 41 | CONFIG_IPV6_ROUTER_PREF=y | 63 | CONFIG_IPV6_ROUTER_PREF=y |
| 42 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 43 | CONFIG_INET6_AH=m | 64 | CONFIG_INET6_AH=m |
| 44 | CONFIG_INET6_ESP=m | 65 | CONFIG_INET6_ESP=m |
| 45 | CONFIG_INET6_IPCOMP=m | 66 | CONFIG_INET6_IPCOMP=m |
| 46 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 67 | CONFIG_IPV6_GRE=m |
| 47 | CONFIG_IPV6_TUNNEL=m | ||
| 48 | CONFIG_NETFILTER=y | 68 | CONFIG_NETFILTER=y |
| 49 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
| 50 | CONFIG_NF_CONNTRACK=m | 69 | CONFIG_NF_CONNTRACK=m |
| 70 | CONFIG_NF_CONNTRACK_ZONES=y | ||
| 71 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
| 51 | # CONFIG_NF_CT_PROTO_DCCP is not set | 72 | # CONFIG_NF_CT_PROTO_DCCP is not set |
| 52 | CONFIG_NF_CT_PROTO_UDPLITE=m | 73 | CONFIG_NF_CT_PROTO_UDPLITE=m |
| 53 | CONFIG_NF_CONNTRACK_AMANDA=m | 74 | CONFIG_NF_CONNTRACK_AMANDA=m |
| @@ -55,25 +76,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
| 55 | CONFIG_NF_CONNTRACK_H323=m | 76 | CONFIG_NF_CONNTRACK_H323=m |
| 56 | CONFIG_NF_CONNTRACK_IRC=m | 77 | CONFIG_NF_CONNTRACK_IRC=m |
| 57 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 78 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
| 79 | CONFIG_NF_CONNTRACK_SNMP=m | ||
| 58 | CONFIG_NF_CONNTRACK_PPTP=m | 80 | CONFIG_NF_CONNTRACK_PPTP=m |
| 59 | CONFIG_NF_CONNTRACK_SANE=m | 81 | CONFIG_NF_CONNTRACK_SANE=m |
| 60 | CONFIG_NF_CONNTRACK_SIP=m | 82 | CONFIG_NF_CONNTRACK_SIP=m |
| 61 | CONFIG_NF_CONNTRACK_TFTP=m | 83 | CONFIG_NF_CONNTRACK_TFTP=m |
| 84 | CONFIG_NETFILTER_XT_SET=m | ||
| 85 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
| 62 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 86 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 63 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 87 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 64 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 88 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 89 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
| 90 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
| 91 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
| 65 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 92 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 66 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 93 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 67 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 94 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 95 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
| 96 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
| 68 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 97 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 69 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 98 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 70 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 99 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 100 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
| 101 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
| 71 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 102 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
| 72 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 103 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 73 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 104 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 105 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
| 74 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 106 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| 75 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 107 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 76 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 108 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 109 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
| 77 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 110 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 78 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 111 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 79 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 112 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| @@ -84,6 +117,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
| 84 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 117 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 85 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 118 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 86 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 119 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
| 120 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
| 121 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
| 87 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 122 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 88 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 123 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 89 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 124 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| @@ -97,22 +132,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 97 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 132 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 98 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 133 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 99 | CONFIG_NETFILTER_XT_MATCH_U32=m | 134 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 135 | CONFIG_IP_SET=m | ||
| 136 | CONFIG_IP_SET_BITMAP_IP=m | ||
| 137 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
| 138 | CONFIG_IP_SET_BITMAP_PORT=m | ||
| 139 | CONFIG_IP_SET_HASH_IP=m | ||
| 140 | CONFIG_IP_SET_HASH_IPPORT=m | ||
| 141 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
| 142 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
| 143 | CONFIG_IP_SET_HASH_NET=m | ||
| 144 | CONFIG_IP_SET_HASH_NETPORT=m | ||
| 145 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
| 146 | CONFIG_IP_SET_LIST_SET=m | ||
| 100 | CONFIG_NF_CONNTRACK_IPV4=m | 147 | CONFIG_NF_CONNTRACK_IPV4=m |
| 101 | CONFIG_IP_NF_QUEUE=m | ||
| 102 | CONFIG_IP_NF_IPTABLES=m | 148 | CONFIG_IP_NF_IPTABLES=m |
| 103 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 104 | CONFIG_IP_NF_MATCH_AH=m | 149 | CONFIG_IP_NF_MATCH_AH=m |
| 105 | CONFIG_IP_NF_MATCH_ECN=m | 150 | CONFIG_IP_NF_MATCH_ECN=m |
| 151 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
| 106 | CONFIG_IP_NF_MATCH_TTL=m | 152 | CONFIG_IP_NF_MATCH_TTL=m |
| 107 | CONFIG_IP_NF_FILTER=m | 153 | CONFIG_IP_NF_FILTER=m |
| 108 | CONFIG_IP_NF_TARGET_REJECT=m | 154 | CONFIG_IP_NF_TARGET_REJECT=m |
| 109 | CONFIG_IP_NF_TARGET_LOG=m | ||
| 110 | CONFIG_IP_NF_TARGET_ULOG=m | 155 | CONFIG_IP_NF_TARGET_ULOG=m |
| 111 | CONFIG_NF_NAT=m | 156 | CONFIG_NF_NAT_IPV4=m |
| 112 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 157 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 113 | CONFIG_IP_NF_TARGET_NETMAP=m | 158 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 114 | CONFIG_IP_NF_TARGET_REDIRECT=m | 159 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 115 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
| 116 | CONFIG_IP_NF_MANGLE=m | 160 | CONFIG_IP_NF_MANGLE=m |
| 117 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 161 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
| 118 | CONFIG_IP_NF_TARGET_ECN=m | 162 | CONFIG_IP_NF_TARGET_ECN=m |
| @@ -122,7 +166,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
| 122 | CONFIG_IP_NF_ARPFILTER=m | 166 | CONFIG_IP_NF_ARPFILTER=m |
| 123 | CONFIG_IP_NF_ARP_MANGLE=m | 167 | CONFIG_IP_NF_ARP_MANGLE=m |
| 124 | CONFIG_NF_CONNTRACK_IPV6=m | 168 | CONFIG_NF_CONNTRACK_IPV6=m |
| 125 | CONFIG_IP6_NF_QUEUE=m | ||
| 126 | CONFIG_IP6_NF_IPTABLES=m | 169 | CONFIG_IP6_NF_IPTABLES=m |
| 127 | CONFIG_IP6_NF_MATCH_AH=m | 170 | CONFIG_IP6_NF_MATCH_AH=m |
| 128 | CONFIG_IP6_NF_MATCH_EUI64=m | 171 | CONFIG_IP6_NF_MATCH_EUI64=m |
| @@ -131,21 +174,34 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
| 131 | CONFIG_IP6_NF_MATCH_HL=m | 174 | CONFIG_IP6_NF_MATCH_HL=m |
| 132 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 175 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 133 | CONFIG_IP6_NF_MATCH_MH=m | 176 | CONFIG_IP6_NF_MATCH_MH=m |
| 177 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
| 134 | CONFIG_IP6_NF_MATCH_RT=m | 178 | CONFIG_IP6_NF_MATCH_RT=m |
| 135 | CONFIG_IP6_NF_TARGET_HL=m | 179 | CONFIG_IP6_NF_TARGET_HL=m |
| 136 | CONFIG_IP6_NF_TARGET_LOG=m | ||
| 137 | CONFIG_IP6_NF_FILTER=m | 180 | CONFIG_IP6_NF_FILTER=m |
| 138 | CONFIG_IP6_NF_TARGET_REJECT=m | 181 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 139 | CONFIG_IP6_NF_MANGLE=m | 182 | CONFIG_IP6_NF_MANGLE=m |
| 140 | CONFIG_IP6_NF_RAW=m | 183 | CONFIG_IP6_NF_RAW=m |
| 184 | CONFIG_NF_NAT_IPV6=m | ||
| 185 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
| 186 | CONFIG_IP6_NF_TARGET_NPT=m | ||
| 141 | CONFIG_IP_DCCP=m | 187 | CONFIG_IP_DCCP=m |
| 142 | # CONFIG_IP_DCCP_CCID3 is not set | 188 | # CONFIG_IP_DCCP_CCID3 is not set |
| 189 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
| 190 | CONFIG_RDS=m | ||
| 191 | CONFIG_RDS_TCP=m | ||
| 192 | CONFIG_L2TP=m | ||
| 143 | CONFIG_ATALK=m | 193 | CONFIG_ATALK=m |
| 194 | CONFIG_BATMAN_ADV=m | ||
| 195 | CONFIG_BATMAN_ADV_DAT=y | ||
| 196 | # CONFIG_WIRELESS is not set | ||
| 144 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 197 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 198 | CONFIG_DEVTMPFS=y | ||
| 145 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 199 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
| 200 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
| 146 | CONFIG_CONNECTOR=m | 201 | CONFIG_CONNECTOR=m |
| 147 | CONFIG_BLK_DEV_LOOP=y | 202 | CONFIG_BLK_DEV_LOOP=y |
| 148 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 203 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
| 204 | CONFIG_BLK_DEV_DRBD=m | ||
| 149 | CONFIG_BLK_DEV_NBD=m | 205 | CONFIG_BLK_DEV_NBD=m |
| 150 | CONFIG_BLK_DEV_RAM=y | 206 | CONFIG_BLK_DEV_RAM=y |
| 151 | CONFIG_CDROM_PKTCDVD=m | 207 | CONFIG_CDROM_PKTCDVD=m |
| @@ -160,103 +216,131 @@ CONFIG_BLK_DEV_SR=y | |||
| 160 | CONFIG_BLK_DEV_SR_VENDOR=y | 216 | CONFIG_BLK_DEV_SR_VENDOR=y |
| 161 | CONFIG_CHR_DEV_SG=m | 217 | CONFIG_CHR_DEV_SG=m |
| 162 | CONFIG_SCSI_CONSTANTS=y | 218 | CONFIG_SCSI_CONSTANTS=y |
| 163 | CONFIG_SCSI_SAS_LIBSAS=m | 219 | CONFIG_SCSI_SAS_ATTRS=m |
| 164 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
| 165 | CONFIG_SCSI_SRP_ATTRS=m | ||
| 166 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
| 167 | CONFIG_ISCSI_TCP=m | 220 | CONFIG_ISCSI_TCP=m |
| 221 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
| 168 | CONFIG_MVME16x_SCSI=y | 222 | CONFIG_MVME16x_SCSI=y |
| 169 | CONFIG_MD=y | 223 | CONFIG_MD=y |
| 170 | CONFIG_BLK_DEV_MD=m | ||
| 171 | CONFIG_MD_LINEAR=m | 224 | CONFIG_MD_LINEAR=m |
| 172 | CONFIG_MD_RAID0=m | 225 | CONFIG_MD_RAID0=m |
| 173 | CONFIG_MD_RAID1=m | ||
| 174 | CONFIG_MD_RAID456=m | ||
| 175 | CONFIG_BLK_DEV_DM=m | 226 | CONFIG_BLK_DEV_DM=m |
| 176 | CONFIG_DM_CRYPT=m | 227 | CONFIG_DM_CRYPT=m |
| 177 | CONFIG_DM_SNAPSHOT=m | 228 | CONFIG_DM_SNAPSHOT=m |
| 229 | CONFIG_DM_THIN_PROVISIONING=m | ||
| 230 | CONFIG_DM_CACHE=m | ||
| 178 | CONFIG_DM_MIRROR=m | 231 | CONFIG_DM_MIRROR=m |
| 232 | CONFIG_DM_RAID=m | ||
| 179 | CONFIG_DM_ZERO=m | 233 | CONFIG_DM_ZERO=m |
| 180 | CONFIG_DM_MULTIPATH=m | 234 | CONFIG_DM_MULTIPATH=m |
| 181 | CONFIG_DM_UEVENT=y | 235 | CONFIG_DM_UEVENT=y |
| 236 | CONFIG_TARGET_CORE=m | ||
| 237 | CONFIG_TCM_IBLOCK=m | ||
| 238 | CONFIG_TCM_FILEIO=m | ||
| 239 | CONFIG_TCM_PSCSI=m | ||
| 182 | CONFIG_NETDEVICES=y | 240 | CONFIG_NETDEVICES=y |
| 183 | CONFIG_DUMMY=m | 241 | CONFIG_DUMMY=m |
| 184 | CONFIG_MACVLAN=m | ||
| 185 | CONFIG_EQUALIZER=m | 242 | CONFIG_EQUALIZER=m |
| 243 | CONFIG_NET_TEAM=m | ||
| 244 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
| 245 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
| 246 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
| 247 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
| 248 | CONFIG_VXLAN=m | ||
| 249 | CONFIG_NETCONSOLE=m | ||
| 250 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
| 186 | CONFIG_VETH=m | 251 | CONFIG_VETH=m |
| 187 | CONFIG_NET_ETHERNET=y | 252 | # CONFIG_NET_CADENCE is not set |
| 253 | # CONFIG_NET_VENDOR_BROADCOM is not set | ||
| 188 | CONFIG_MVME16x_NET=y | 254 | CONFIG_MVME16x_NET=y |
| 189 | # CONFIG_NETDEV_1000 is not set | 255 | # CONFIG_NET_VENDOR_MARVELL is not set |
| 190 | # CONFIG_NETDEV_10000 is not set | 256 | # CONFIG_NET_VENDOR_MICREL is not set |
| 257 | # CONFIG_NET_VENDOR_NATSEMI is not set | ||
| 258 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
| 259 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
| 260 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
| 191 | CONFIG_PPP=m | 261 | CONFIG_PPP=m |
| 192 | CONFIG_PPP_FILTER=y | ||
| 193 | CONFIG_PPP_ASYNC=m | ||
| 194 | CONFIG_PPP_SYNC_TTY=m | ||
| 195 | CONFIG_PPP_DEFLATE=m | ||
| 196 | CONFIG_PPP_BSDCOMP=m | 262 | CONFIG_PPP_BSDCOMP=m |
| 263 | CONFIG_PPP_DEFLATE=m | ||
| 264 | CONFIG_PPP_FILTER=y | ||
| 197 | CONFIG_PPP_MPPE=m | 265 | CONFIG_PPP_MPPE=m |
| 198 | CONFIG_PPPOE=m | 266 | CONFIG_PPPOE=m |
| 267 | CONFIG_PPTP=m | ||
| 268 | CONFIG_PPPOL2TP=m | ||
| 269 | CONFIG_PPP_ASYNC=m | ||
| 270 | CONFIG_PPP_SYNC_TTY=m | ||
| 199 | CONFIG_SLIP=m | 271 | CONFIG_SLIP=m |
| 200 | CONFIG_SLIP_COMPRESSED=y | 272 | CONFIG_SLIP_COMPRESSED=y |
| 201 | CONFIG_SLIP_SMART=y | 273 | CONFIG_SLIP_SMART=y |
| 202 | CONFIG_SLIP_MODE_SLIP6=y | 274 | CONFIG_SLIP_MODE_SLIP6=y |
| 203 | CONFIG_NETCONSOLE=m | 275 | # CONFIG_WLAN is not set |
| 204 | CONFIG_NETCONSOLE_DYNAMIC=y | 276 | CONFIG_INPUT_EVDEV=m |
| 205 | CONFIG_INPUT_FF_MEMLESS=m | ||
| 206 | # CONFIG_KEYBOARD_ATKBD is not set | 277 | # CONFIG_KEYBOARD_ATKBD is not set |
| 207 | CONFIG_MOUSE_PS2=m | 278 | # CONFIG_MOUSE_PS2 is not set |
| 208 | CONFIG_MOUSE_SERIAL=m | 279 | # CONFIG_SERIO is not set |
| 209 | CONFIG_SERIO=m | ||
| 210 | # CONFIG_SERIO_SERPORT is not set | ||
| 211 | CONFIG_VT_HW_CONSOLE_BINDING=y | 280 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 281 | # CONFIG_LEGACY_PTYS is not set | ||
| 212 | # CONFIG_DEVKMEM is not set | 282 | # CONFIG_DEVKMEM is not set |
| 213 | # CONFIG_HW_RANDOM is not set | 283 | # CONFIG_HW_RANDOM is not set |
| 214 | CONFIG_GEN_RTC=m | 284 | CONFIG_NTP_PPS=y |
| 215 | CONFIG_GEN_RTC_X=y | 285 | CONFIG_PPS_CLIENT_LDISC=m |
| 286 | CONFIG_PTP_1588_CLOCK=m | ||
| 216 | # CONFIG_HWMON is not set | 287 | # CONFIG_HWMON is not set |
| 217 | CONFIG_HID=m | 288 | CONFIG_HID=m |
| 218 | CONFIG_HIDRAW=y | 289 | CONFIG_HIDRAW=y |
| 290 | CONFIG_UHID=m | ||
| 291 | # CONFIG_HID_GENERIC is not set | ||
| 219 | # CONFIG_USB_SUPPORT is not set | 292 | # CONFIG_USB_SUPPORT is not set |
| 293 | CONFIG_RTC_CLASS=y | ||
| 294 | CONFIG_RTC_DRV_GENERIC=m | ||
| 295 | # CONFIG_IOMMU_SUPPORT is not set | ||
| 296 | CONFIG_PROC_HARDWARE=y | ||
| 220 | CONFIG_EXT2_FS=y | 297 | CONFIG_EXT2_FS=y |
| 221 | CONFIG_EXT3_FS=y | 298 | CONFIG_EXT3_FS=y |
| 222 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 299 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
| 223 | # CONFIG_EXT3_FS_XATTR is not set | 300 | # CONFIG_EXT3_FS_XATTR is not set |
| 301 | CONFIG_EXT4_FS=y | ||
| 224 | CONFIG_REISERFS_FS=m | 302 | CONFIG_REISERFS_FS=m |
| 225 | CONFIG_JFS_FS=m | 303 | CONFIG_JFS_FS=m |
| 226 | CONFIG_XFS_FS=m | 304 | CONFIG_XFS_FS=m |
| 227 | CONFIG_OCFS2_FS=m | 305 | CONFIG_OCFS2_FS=m |
| 228 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 229 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 306 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 307 | CONFIG_FANOTIFY=y | ||
| 230 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 308 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 231 | # CONFIG_PRINT_QUOTA_WARNING is not set | 309 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 232 | CONFIG_AUTOFS_FS=m | ||
| 233 | CONFIG_AUTOFS4_FS=m | 310 | CONFIG_AUTOFS4_FS=m |
| 234 | CONFIG_FUSE_FS=m | 311 | CONFIG_FUSE_FS=m |
| 312 | CONFIG_CUSE=m | ||
| 235 | CONFIG_ISO9660_FS=y | 313 | CONFIG_ISO9660_FS=y |
| 236 | CONFIG_JOLIET=y | 314 | CONFIG_JOLIET=y |
| 237 | CONFIG_ZISOFS=y | 315 | CONFIG_ZISOFS=y |
| 238 | CONFIG_UDF_FS=m | 316 | CONFIG_UDF_FS=m |
| 239 | CONFIG_MSDOS_FS=y | 317 | CONFIG_MSDOS_FS=m |
| 240 | CONFIG_VFAT_FS=m | 318 | CONFIG_VFAT_FS=m |
| 241 | CONFIG_PROC_KCORE=y | 319 | CONFIG_PROC_KCORE=y |
| 242 | CONFIG_TMPFS=y | 320 | CONFIG_TMPFS=y |
| 243 | CONFIG_AFFS_FS=m | 321 | CONFIG_AFFS_FS=m |
| 322 | CONFIG_ECRYPT_FS=m | ||
| 323 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
| 244 | CONFIG_HFS_FS=m | 324 | CONFIG_HFS_FS=m |
| 245 | CONFIG_HFSPLUS_FS=m | 325 | CONFIG_HFSPLUS_FS=m |
| 246 | CONFIG_CRAMFS=m | 326 | CONFIG_CRAMFS=m |
| 247 | CONFIG_SQUASHFS=m | 327 | CONFIG_SQUASHFS=m |
| 248 | CONFIG_MINIX_FS=y | 328 | CONFIG_SQUASHFS_LZO=y |
| 329 | CONFIG_MINIX_FS=m | ||
| 330 | CONFIG_OMFS_FS=m | ||
| 249 | CONFIG_HPFS_FS=m | 331 | CONFIG_HPFS_FS=m |
| 332 | CONFIG_QNX4FS_FS=m | ||
| 333 | CONFIG_QNX6FS_FS=m | ||
| 250 | CONFIG_SYSV_FS=m | 334 | CONFIG_SYSV_FS=m |
| 251 | CONFIG_UFS_FS=m | 335 | CONFIG_UFS_FS=m |
| 252 | CONFIG_NFS_FS=y | 336 | CONFIG_NFS_FS=y |
| 253 | CONFIG_NFS_V3=y | ||
| 254 | CONFIG_NFS_V4=y | 337 | CONFIG_NFS_V4=y |
| 338 | CONFIG_NFS_SWAP=y | ||
| 255 | CONFIG_ROOT_NFS=y | 339 | CONFIG_ROOT_NFS=y |
| 256 | CONFIG_NFSD=m | 340 | CONFIG_NFSD=m |
| 257 | CONFIG_NFSD_V3=y | 341 | CONFIG_NFSD_V3=y |
| 258 | CONFIG_SMB_FS=m | 342 | CONFIG_CIFS=m |
| 259 | CONFIG_SMB_NLS_DEFAULT=y | 343 | # CONFIG_CIFS_DEBUG is not set |
| 260 | CONFIG_CODA_FS=m | 344 | CONFIG_CODA_FS=m |
| 261 | CONFIG_NLS_CODEPAGE_437=y | 345 | CONFIG_NLS_CODEPAGE_437=y |
| 262 | CONFIG_NLS_CODEPAGE_737=m | 346 | CONFIG_NLS_CODEPAGE_737=m |
| @@ -295,10 +379,23 @@ CONFIG_NLS_ISO8859_14=m | |||
| 295 | CONFIG_NLS_ISO8859_15=m | 379 | CONFIG_NLS_ISO8859_15=m |
| 296 | CONFIG_NLS_KOI8_R=m | 380 | CONFIG_NLS_KOI8_R=m |
| 297 | CONFIG_NLS_KOI8_U=m | 381 | CONFIG_NLS_KOI8_U=m |
| 382 | CONFIG_NLS_MAC_ROMAN=m | ||
| 383 | CONFIG_NLS_MAC_CELTIC=m | ||
| 384 | CONFIG_NLS_MAC_CENTEURO=m | ||
| 385 | CONFIG_NLS_MAC_CROATIAN=m | ||
| 386 | CONFIG_NLS_MAC_CYRILLIC=m | ||
| 387 | CONFIG_NLS_MAC_GAELIC=m | ||
| 388 | CONFIG_NLS_MAC_GREEK=m | ||
| 389 | CONFIG_NLS_MAC_ICELAND=m | ||
| 390 | CONFIG_NLS_MAC_INUIT=m | ||
| 391 | CONFIG_NLS_MAC_ROMANIAN=m | ||
| 392 | CONFIG_NLS_MAC_TURKISH=m | ||
| 298 | CONFIG_DLM=m | 393 | CONFIG_DLM=m |
| 299 | CONFIG_MAGIC_SYSRQ=y | 394 | CONFIG_MAGIC_SYSRQ=y |
| 300 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 395 | CONFIG_ASYNC_RAID6_TEST=m |
| 301 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 396 | CONFIG_ENCRYPTED_KEYS=m |
| 397 | CONFIG_CRYPTO_MANAGER=y | ||
| 398 | CONFIG_CRYPTO_USER=m | ||
| 302 | CONFIG_CRYPTO_NULL=m | 399 | CONFIG_CRYPTO_NULL=m |
| 303 | CONFIG_CRYPTO_CRYPTD=m | 400 | CONFIG_CRYPTO_CRYPTD=m |
| 304 | CONFIG_CRYPTO_TEST=m | 401 | CONFIG_CRYPTO_TEST=m |
| @@ -308,19 +405,16 @@ CONFIG_CRYPTO_CTS=m | |||
| 308 | CONFIG_CRYPTO_LRW=m | 405 | CONFIG_CRYPTO_LRW=m |
| 309 | CONFIG_CRYPTO_PCBC=m | 406 | CONFIG_CRYPTO_PCBC=m |
| 310 | CONFIG_CRYPTO_XTS=m | 407 | CONFIG_CRYPTO_XTS=m |
| 311 | CONFIG_CRYPTO_HMAC=y | ||
| 312 | CONFIG_CRYPTO_XCBC=m | 408 | CONFIG_CRYPTO_XCBC=m |
| 313 | CONFIG_CRYPTO_MD4=m | 409 | CONFIG_CRYPTO_VMAC=m |
| 314 | CONFIG_CRYPTO_MICHAEL_MIC=m | 410 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 315 | CONFIG_CRYPTO_RMD128=m | 411 | CONFIG_CRYPTO_RMD128=m |
| 316 | CONFIG_CRYPTO_RMD160=m | 412 | CONFIG_CRYPTO_RMD160=m |
| 317 | CONFIG_CRYPTO_RMD256=m | 413 | CONFIG_CRYPTO_RMD256=m |
| 318 | CONFIG_CRYPTO_RMD320=m | 414 | CONFIG_CRYPTO_RMD320=m |
| 319 | CONFIG_CRYPTO_SHA256=m | ||
| 320 | CONFIG_CRYPTO_SHA512=m | 415 | CONFIG_CRYPTO_SHA512=m |
| 321 | CONFIG_CRYPTO_TGR192=m | 416 | CONFIG_CRYPTO_TGR192=m |
| 322 | CONFIG_CRYPTO_WP512=m | 417 | CONFIG_CRYPTO_WP512=m |
| 323 | CONFIG_CRYPTO_AES=m | ||
| 324 | CONFIG_CRYPTO_ANUBIS=m | 418 | CONFIG_CRYPTO_ANUBIS=m |
| 325 | CONFIG_CRYPTO_BLOWFISH=m | 419 | CONFIG_CRYPTO_BLOWFISH=m |
| 326 | CONFIG_CRYPTO_CAMELLIA=m | 420 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -336,6 +430,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
| 336 | CONFIG_CRYPTO_ZLIB=m | 430 | CONFIG_CRYPTO_ZLIB=m |
| 337 | CONFIG_CRYPTO_LZO=m | 431 | CONFIG_CRYPTO_LZO=m |
| 338 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 432 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 433 | CONFIG_CRYPTO_USER_API_HASH=m | ||
| 434 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
| 339 | # CONFIG_CRYPTO_HW is not set | 435 | # CONFIG_CRYPTO_HW is not set |
| 340 | CONFIG_CRC16=m | ||
| 341 | CONFIG_CRC_T10DIF=y | 436 | CONFIG_CRC_T10DIF=y |
| 437 | CONFIG_XZ_DEC_X86=y | ||
| 438 | CONFIG_XZ_DEC_POWERPC=y | ||
| 439 | CONFIG_XZ_DEC_IA64=y | ||
| 440 | CONFIG_XZ_DEC_ARM=y | ||
| 441 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
| 442 | CONFIG_XZ_DEC_SPARC=y | ||
| 443 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index 19d23db690a4..8982370e8b42 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig | |||
| @@ -1,49 +1,74 @@ | |||
| 1 | CONFIG_EXPERIMENTAL=y | ||
| 2 | CONFIG_LOCALVERSION="-q40" | 1 | CONFIG_LOCALVERSION="-q40" |
| 3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
| 4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
| 4 | CONFIG_FHANDLE=y | ||
| 5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
| 6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
| 7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
| 8 | # CONFIG_UTS_NS is not set | ||
| 9 | # CONFIG_IPC_NS is not set | ||
| 10 | # CONFIG_PID_NS is not set | ||
| 11 | # CONFIG_NET_NS is not set | ||
| 8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
| 9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
| 11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
| 12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
| 13 | CONFIG_Q40=y | 16 | CONFIG_PARTITION_ADVANCED=y |
| 17 | CONFIG_AMIGA_PARTITION=y | ||
| 18 | CONFIG_ATARI_PARTITION=y | ||
| 19 | CONFIG_MAC_PARTITION=y | ||
| 20 | CONFIG_BSD_DISKLABEL=y | ||
| 21 | CONFIG_MINIX_SUBPARTITION=y | ||
| 22 | CONFIG_SOLARIS_X86_PARTITION=y | ||
| 23 | CONFIG_UNIXWARE_DISKLABEL=y | ||
| 24 | CONFIG_SUN_PARTITION=y | ||
| 25 | # CONFIG_EFI_PARTITION is not set | ||
| 26 | CONFIG_SYSV68_PARTITION=y | ||
| 27 | CONFIG_IOSCHED_DEADLINE=m | ||
| 14 | CONFIG_M68040=y | 28 | CONFIG_M68040=y |
| 15 | CONFIG_M68060=y | 29 | CONFIG_M68060=y |
| 30 | CONFIG_Q40=y | ||
| 31 | # CONFIG_COMPACTION is not set | ||
| 32 | CONFIG_CLEANCACHE=y | ||
| 33 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 16 | CONFIG_BINFMT_AOUT=m | 34 | CONFIG_BINFMT_AOUT=m |
| 17 | CONFIG_BINFMT_MISC=m | 35 | CONFIG_BINFMT_MISC=m |
| 18 | CONFIG_HEARTBEAT=y | ||
| 19 | CONFIG_PROC_HARDWARE=y | ||
| 20 | CONFIG_NET=y | 36 | CONFIG_NET=y |
| 21 | CONFIG_PACKET=y | 37 | CONFIG_PACKET=y |
| 38 | CONFIG_PACKET_DIAG=m | ||
| 22 | CONFIG_UNIX=y | 39 | CONFIG_UNIX=y |
| 40 | CONFIG_UNIX_DIAG=m | ||
| 41 | CONFIG_XFRM_MIGRATE=y | ||
| 23 | CONFIG_NET_KEY=y | 42 | CONFIG_NET_KEY=y |
| 24 | CONFIG_NET_KEY_MIGRATE=y | ||
| 25 | CONFIG_INET=y | 43 | CONFIG_INET=y |
| 44 | CONFIG_IP_PNP=y | ||
| 45 | CONFIG_IP_PNP_DHCP=y | ||
| 46 | CONFIG_IP_PNP_BOOTP=y | ||
| 47 | CONFIG_IP_PNP_RARP=y | ||
| 26 | CONFIG_NET_IPIP=m | 48 | CONFIG_NET_IPIP=m |
| 49 | CONFIG_NET_IPGRE_DEMUX=m | ||
| 27 | CONFIG_NET_IPGRE=m | 50 | CONFIG_NET_IPGRE=m |
| 28 | CONFIG_SYN_COOKIES=y | 51 | CONFIG_SYN_COOKIES=y |
| 52 | CONFIG_NET_IPVTI=m | ||
| 29 | CONFIG_INET_AH=m | 53 | CONFIG_INET_AH=m |
| 30 | CONFIG_INET_ESP=m | 54 | CONFIG_INET_ESP=m |
| 31 | CONFIG_INET_IPCOMP=m | 55 | CONFIG_INET_IPCOMP=m |
| 32 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 56 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 33 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 57 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 34 | CONFIG_INET_XFRM_MODE_BEET=m | 58 | CONFIG_INET_XFRM_MODE_BEET=m |
| 59 | # CONFIG_INET_LRO is not set | ||
| 35 | CONFIG_INET_DIAG=m | 60 | CONFIG_INET_DIAG=m |
| 61 | CONFIG_INET_UDP_DIAG=m | ||
| 36 | CONFIG_IPV6_PRIVACY=y | 62 | CONFIG_IPV6_PRIVACY=y |
| 37 | CONFIG_IPV6_ROUTER_PREF=y | 63 | CONFIG_IPV6_ROUTER_PREF=y |
| 38 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 39 | CONFIG_INET6_AH=m | 64 | CONFIG_INET6_AH=m |
| 40 | CONFIG_INET6_ESP=m | 65 | CONFIG_INET6_ESP=m |
| 41 | CONFIG_INET6_IPCOMP=m | 66 | CONFIG_INET6_IPCOMP=m |
| 42 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 67 | CONFIG_IPV6_GRE=m |
| 43 | CONFIG_IPV6_TUNNEL=m | ||
| 44 | CONFIG_NETFILTER=y | 68 | CONFIG_NETFILTER=y |
| 45 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
| 46 | CONFIG_NF_CONNTRACK=m | 69 | CONFIG_NF_CONNTRACK=m |
| 70 | CONFIG_NF_CONNTRACK_ZONES=y | ||
| 71 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
| 47 | # CONFIG_NF_CT_PROTO_DCCP is not set | 72 | # CONFIG_NF_CT_PROTO_DCCP is not set |
| 48 | CONFIG_NF_CT_PROTO_UDPLITE=m | 73 | CONFIG_NF_CT_PROTO_UDPLITE=m |
| 49 | CONFIG_NF_CONNTRACK_AMANDA=m | 74 | CONFIG_NF_CONNTRACK_AMANDA=m |
| @@ -51,25 +76,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
| 51 | CONFIG_NF_CONNTRACK_H323=m | 76 | CONFIG_NF_CONNTRACK_H323=m |
| 52 | CONFIG_NF_CONNTRACK_IRC=m | 77 | CONFIG_NF_CONNTRACK_IRC=m |
| 53 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 78 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
| 79 | CONFIG_NF_CONNTRACK_SNMP=m | ||
| 54 | CONFIG_NF_CONNTRACK_PPTP=m | 80 | CONFIG_NF_CONNTRACK_PPTP=m |
| 55 | CONFIG_NF_CONNTRACK_SANE=m | 81 | CONFIG_NF_CONNTRACK_SANE=m |
| 56 | CONFIG_NF_CONNTRACK_SIP=m | 82 | CONFIG_NF_CONNTRACK_SIP=m |
| 57 | CONFIG_NF_CONNTRACK_TFTP=m | 83 | CONFIG_NF_CONNTRACK_TFTP=m |
| 84 | CONFIG_NETFILTER_XT_SET=m | ||
| 85 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
| 58 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 86 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 59 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 87 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 60 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 88 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 89 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
| 90 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
| 91 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
| 61 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 92 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 62 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 93 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 63 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 94 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 95 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
| 96 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
| 64 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 97 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 65 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 98 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 66 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 99 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 100 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
| 101 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
| 67 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 102 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
| 68 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 103 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 69 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 104 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 105 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
| 70 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 106 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| 71 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 107 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 72 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 108 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 109 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
| 73 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 110 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 74 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 111 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 75 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 112 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| @@ -80,6 +117,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
| 80 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 117 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 81 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 118 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 82 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 119 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
| 120 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
| 121 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
| 83 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 122 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 84 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 123 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 85 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 124 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| @@ -93,22 +132,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 93 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 132 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 94 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 133 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 95 | CONFIG_NETFILTER_XT_MATCH_U32=m | 134 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 135 | CONFIG_IP_SET=m | ||
| 136 | CONFIG_IP_SET_BITMAP_IP=m | ||
| 137 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
| 138 | CONFIG_IP_SET_BITMAP_PORT=m | ||
| 139 | CONFIG_IP_SET_HASH_IP=m | ||
| 140 | CONFIG_IP_SET_HASH_IPPORT=m | ||
| 141 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
| 142 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
| 143 | CONFIG_IP_SET_HASH_NET=m | ||
| 144 | CONFIG_IP_SET_HASH_NETPORT=m | ||
| 145 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
| 146 | CONFIG_IP_SET_LIST_SET=m | ||
| 96 | CONFIG_NF_CONNTRACK_IPV4=m | 147 | CONFIG_NF_CONNTRACK_IPV4=m |
| 97 | CONFIG_IP_NF_QUEUE=m | ||
| 98 | CONFIG_IP_NF_IPTABLES=m | 148 | CONFIG_IP_NF_IPTABLES=m |
| 99 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 100 | CONFIG_IP_NF_MATCH_AH=m | 149 | CONFIG_IP_NF_MATCH_AH=m |
| 101 | CONFIG_IP_NF_MATCH_ECN=m | 150 | CONFIG_IP_NF_MATCH_ECN=m |
| 151 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
| 102 | CONFIG_IP_NF_MATCH_TTL=m | 152 | CONFIG_IP_NF_MATCH_TTL=m |
| 103 | CONFIG_IP_NF_FILTER=m | 153 | CONFIG_IP_NF_FILTER=m |
| 104 | CONFIG_IP_NF_TARGET_REJECT=m | 154 | CONFIG_IP_NF_TARGET_REJECT=m |
| 105 | CONFIG_IP_NF_TARGET_LOG=m | ||
| 106 | CONFIG_IP_NF_TARGET_ULOG=m | 155 | CONFIG_IP_NF_TARGET_ULOG=m |
| 107 | CONFIG_NF_NAT=m | 156 | CONFIG_NF_NAT_IPV4=m |
| 108 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 157 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 109 | CONFIG_IP_NF_TARGET_NETMAP=m | 158 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 110 | CONFIG_IP_NF_TARGET_REDIRECT=m | 159 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 111 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
| 112 | CONFIG_IP_NF_MANGLE=m | 160 | CONFIG_IP_NF_MANGLE=m |
| 113 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 161 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
| 114 | CONFIG_IP_NF_TARGET_ECN=m | 162 | CONFIG_IP_NF_TARGET_ECN=m |
| @@ -118,7 +166,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
| 118 | CONFIG_IP_NF_ARPFILTER=m | 166 | CONFIG_IP_NF_ARPFILTER=m |
| 119 | CONFIG_IP_NF_ARP_MANGLE=m | 167 | CONFIG_IP_NF_ARP_MANGLE=m |
| 120 | CONFIG_NF_CONNTRACK_IPV6=m | 168 | CONFIG_NF_CONNTRACK_IPV6=m |
| 121 | CONFIG_IP6_NF_QUEUE=m | ||
| 122 | CONFIG_IP6_NF_IPTABLES=m | 169 | CONFIG_IP6_NF_IPTABLES=m |
| 123 | CONFIG_IP6_NF_MATCH_AH=m | 170 | CONFIG_IP6_NF_MATCH_AH=m |
| 124 | CONFIG_IP6_NF_MATCH_EUI64=m | 171 | CONFIG_IP6_NF_MATCH_EUI64=m |
| @@ -127,26 +174,40 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
| 127 | CONFIG_IP6_NF_MATCH_HL=m | 174 | CONFIG_IP6_NF_MATCH_HL=m |
| 128 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 175 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 129 | CONFIG_IP6_NF_MATCH_MH=m | 176 | CONFIG_IP6_NF_MATCH_MH=m |
| 177 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
| 130 | CONFIG_IP6_NF_MATCH_RT=m | 178 | CONFIG_IP6_NF_MATCH_RT=m |
| 131 | CONFIG_IP6_NF_TARGET_HL=m | 179 | CONFIG_IP6_NF_TARGET_HL=m |
| 132 | CONFIG_IP6_NF_TARGET_LOG=m | ||
| 133 | CONFIG_IP6_NF_FILTER=m | 180 | CONFIG_IP6_NF_FILTER=m |
| 134 | CONFIG_IP6_NF_TARGET_REJECT=m | 181 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 135 | CONFIG_IP6_NF_MANGLE=m | 182 | CONFIG_IP6_NF_MANGLE=m |
| 136 | CONFIG_IP6_NF_RAW=m | 183 | CONFIG_IP6_NF_RAW=m |
| 184 | CONFIG_NF_NAT_IPV6=m | ||
| 185 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
| 186 | CONFIG_IP6_NF_TARGET_NPT=m | ||
| 137 | CONFIG_IP_DCCP=m | 187 | CONFIG_IP_DCCP=m |
| 138 | # CONFIG_IP_DCCP_CCID3 is not set | 188 | # CONFIG_IP_DCCP_CCID3 is not set |
| 189 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
| 190 | CONFIG_RDS=m | ||
| 191 | CONFIG_RDS_TCP=m | ||
| 192 | CONFIG_L2TP=m | ||
| 139 | CONFIG_ATALK=m | 193 | CONFIG_ATALK=m |
| 194 | CONFIG_BATMAN_ADV=m | ||
| 195 | CONFIG_BATMAN_ADV_DAT=y | ||
| 196 | # CONFIG_WIRELESS is not set | ||
| 140 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 197 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 198 | CONFIG_DEVTMPFS=y | ||
| 141 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 199 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
| 200 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
| 142 | CONFIG_CONNECTOR=m | 201 | CONFIG_CONNECTOR=m |
| 143 | CONFIG_BLK_DEV_LOOP=y | 202 | CONFIG_BLK_DEV_LOOP=y |
| 144 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 203 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
| 204 | CONFIG_BLK_DEV_DRBD=m | ||
| 145 | CONFIG_BLK_DEV_NBD=m | 205 | CONFIG_BLK_DEV_NBD=m |
| 146 | CONFIG_BLK_DEV_RAM=y | 206 | CONFIG_BLK_DEV_RAM=y |
| 147 | CONFIG_CDROM_PKTCDVD=m | 207 | CONFIG_CDROM_PKTCDVD=m |
| 148 | CONFIG_ATA_OVER_ETH=m | 208 | CONFIG_ATA_OVER_ETH=m |
| 149 | CONFIG_IDE=y | 209 | CONFIG_IDE=y |
| 210 | CONFIG_IDE_GD_ATAPI=y | ||
| 150 | CONFIG_BLK_DEV_IDECD=y | 211 | CONFIG_BLK_DEV_IDECD=y |
| 151 | CONFIG_BLK_DEV_Q40IDE=y | 212 | CONFIG_BLK_DEV_Q40IDE=y |
| 152 | CONFIG_RAID_ATTRS=m | 213 | CONFIG_RAID_ATTRS=m |
| @@ -159,61 +220,82 @@ CONFIG_BLK_DEV_SR=y | |||
| 159 | CONFIG_BLK_DEV_SR_VENDOR=y | 220 | CONFIG_BLK_DEV_SR_VENDOR=y |
| 160 | CONFIG_CHR_DEV_SG=m | 221 | CONFIG_CHR_DEV_SG=m |
| 161 | CONFIG_SCSI_CONSTANTS=y | 222 | CONFIG_SCSI_CONSTANTS=y |
| 162 | CONFIG_SCSI_SAS_LIBSAS=m | 223 | CONFIG_SCSI_SAS_ATTRS=m |
| 163 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
| 164 | CONFIG_SCSI_SRP_ATTRS=m | ||
| 165 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
| 166 | CONFIG_ISCSI_TCP=m | 224 | CONFIG_ISCSI_TCP=m |
| 225 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
| 167 | CONFIG_MD=y | 226 | CONFIG_MD=y |
| 168 | CONFIG_BLK_DEV_MD=m | ||
| 169 | CONFIG_MD_LINEAR=m | 227 | CONFIG_MD_LINEAR=m |
| 170 | CONFIG_MD_RAID0=m | 228 | CONFIG_MD_RAID0=m |
| 171 | CONFIG_MD_RAID1=m | ||
| 172 | CONFIG_MD_RAID456=m | ||
| 173 | CONFIG_BLK_DEV_DM=m | 229 | CONFIG_BLK_DEV_DM=m |
| 174 | CONFIG_DM_CRYPT=m | 230 | CONFIG_DM_CRYPT=m |
| 175 | CONFIG_DM_SNAPSHOT=m | 231 | CONFIG_DM_SNAPSHOT=m |
| 232 | CONFIG_DM_THIN_PROVISIONING=m | ||
| 233 | CONFIG_DM_CACHE=m | ||
| 176 | CONFIG_DM_MIRROR=m | 234 | CONFIG_DM_MIRROR=m |
| 235 | CONFIG_DM_RAID=m | ||
| 177 | CONFIG_DM_ZERO=m | 236 | CONFIG_DM_ZERO=m |
| 178 | CONFIG_DM_MULTIPATH=m | 237 | CONFIG_DM_MULTIPATH=m |
| 179 | CONFIG_DM_UEVENT=y | 238 | CONFIG_DM_UEVENT=y |
| 239 | CONFIG_TARGET_CORE=m | ||
| 240 | CONFIG_TCM_IBLOCK=m | ||
| 241 | CONFIG_TCM_FILEIO=m | ||
| 242 | CONFIG_TCM_PSCSI=m | ||
| 180 | CONFIG_NETDEVICES=y | 243 | CONFIG_NETDEVICES=y |
| 181 | CONFIG_DUMMY=m | 244 | CONFIG_DUMMY=m |
| 182 | CONFIG_MACVLAN=m | ||
| 183 | CONFIG_EQUALIZER=m | 245 | CONFIG_EQUALIZER=m |
| 246 | CONFIG_NET_TEAM=m | ||
| 247 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
| 248 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
| 249 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
| 250 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
| 251 | CONFIG_VXLAN=m | ||
| 252 | CONFIG_NETCONSOLE=m | ||
| 253 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
| 184 | CONFIG_VETH=m | 254 | CONFIG_VETH=m |
| 185 | CONFIG_NET_ETHERNET=y | 255 | # CONFIG_NET_VENDOR_3COM is not set |
| 256 | # CONFIG_NET_VENDOR_AMD is not set | ||
| 257 | # CONFIG_NET_CADENCE is not set | ||
| 258 | # CONFIG_NET_VENDOR_BROADCOM is not set | ||
| 259 | # CONFIG_NET_VENDOR_CIRRUS is not set | ||
| 260 | # CONFIG_NET_VENDOR_FUJITSU is not set | ||
| 261 | # CONFIG_NET_VENDOR_HP is not set | ||
| 262 | # CONFIG_NET_VENDOR_INTEL is not set | ||
| 263 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
| 264 | # CONFIG_NET_VENDOR_MICREL is not set | ||
| 186 | CONFIG_NE2000=m | 265 | CONFIG_NE2000=m |
| 187 | # CONFIG_NETDEV_1000 is not set | 266 | # CONFIG_NET_VENDOR_SEEQ is not set |
| 188 | # CONFIG_NETDEV_10000 is not set | 267 | # CONFIG_NET_VENDOR_SMSC is not set |
| 268 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
| 269 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
| 189 | CONFIG_PPP=m | 270 | CONFIG_PPP=m |
| 190 | CONFIG_PPP_FILTER=y | ||
| 191 | CONFIG_PPP_ASYNC=m | ||
| 192 | CONFIG_PPP_SYNC_TTY=m | ||
| 193 | CONFIG_PPP_DEFLATE=m | ||
| 194 | CONFIG_PPP_BSDCOMP=m | 271 | CONFIG_PPP_BSDCOMP=m |
| 272 | CONFIG_PPP_DEFLATE=m | ||
| 273 | CONFIG_PPP_FILTER=y | ||
| 195 | CONFIG_PPP_MPPE=m | 274 | CONFIG_PPP_MPPE=m |
| 196 | CONFIG_PPPOE=m | 275 | CONFIG_PPPOE=m |
| 276 | CONFIG_PPTP=m | ||
| 277 | CONFIG_PPPOL2TP=m | ||
| 278 | CONFIG_PPP_ASYNC=m | ||
| 279 | CONFIG_PPP_SYNC_TTY=m | ||
| 197 | CONFIG_SLIP=m | 280 | CONFIG_SLIP=m |
| 198 | CONFIG_SLIP_COMPRESSED=y | 281 | CONFIG_SLIP_COMPRESSED=y |
| 199 | CONFIG_SLIP_SMART=y | 282 | CONFIG_SLIP_SMART=y |
| 200 | CONFIG_SLIP_MODE_SLIP6=y | 283 | CONFIG_SLIP_MODE_SLIP6=y |
| 201 | CONFIG_NETCONSOLE=m | 284 | # CONFIG_WLAN is not set |
| 202 | CONFIG_NETCONSOLE_DYNAMIC=y | 285 | CONFIG_INPUT_EVDEV=m |
| 203 | CONFIG_INPUT_FF_MEMLESS=m | ||
| 204 | # CONFIG_KEYBOARD_ATKBD is not set | 286 | # CONFIG_KEYBOARD_ATKBD is not set |
| 205 | CONFIG_MOUSE_PS2=m | 287 | # CONFIG_MOUSE_PS2 is not set |
| 206 | CONFIG_MOUSE_SERIAL=m | 288 | CONFIG_MOUSE_SERIAL=m |
| 207 | CONFIG_INPUT_MISC=y | 289 | CONFIG_INPUT_MISC=y |
| 208 | CONFIG_INPUT_M68K_BEEP=m | 290 | CONFIG_INPUT_M68K_BEEP=m |
| 209 | CONFIG_SERIO=m | 291 | CONFIG_SERIO_Q40KBD=y |
| 210 | # CONFIG_SERIO_SERPORT is not set | ||
| 211 | CONFIG_SERIO_Q40KBD=m | ||
| 212 | CONFIG_VT_HW_CONSOLE_BINDING=y | 292 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 293 | # CONFIG_LEGACY_PTYS is not set | ||
| 213 | # CONFIG_DEVKMEM is not set | 294 | # CONFIG_DEVKMEM is not set |
| 214 | # CONFIG_HW_RANDOM is not set | 295 | # CONFIG_HW_RANDOM is not set |
| 215 | CONFIG_GEN_RTC=m | 296 | CONFIG_NTP_PPS=y |
| 216 | CONFIG_GEN_RTC_X=y | 297 | CONFIG_PPS_CLIENT_LDISC=m |
| 298 | CONFIG_PTP_1588_CLOCK=m | ||
| 217 | # CONFIG_HWMON is not set | 299 | # CONFIG_HWMON is not set |
| 218 | CONFIG_FB=y | 300 | CONFIG_FB=y |
| 219 | CONFIG_FRAMEBUFFER_CONSOLE=y | 301 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| @@ -222,46 +304,61 @@ CONFIG_SOUND=m | |||
| 222 | CONFIG_DMASOUND_Q40=m | 304 | CONFIG_DMASOUND_Q40=m |
| 223 | CONFIG_HID=m | 305 | CONFIG_HID=m |
| 224 | CONFIG_HIDRAW=y | 306 | CONFIG_HIDRAW=y |
| 307 | CONFIG_UHID=m | ||
| 308 | # CONFIG_HID_GENERIC is not set | ||
| 225 | # CONFIG_USB_SUPPORT is not set | 309 | # CONFIG_USB_SUPPORT is not set |
| 310 | CONFIG_RTC_CLASS=y | ||
| 311 | CONFIG_RTC_DRV_GENERIC=m | ||
| 312 | # CONFIG_IOMMU_SUPPORT is not set | ||
| 313 | CONFIG_HEARTBEAT=y | ||
| 314 | CONFIG_PROC_HARDWARE=y | ||
| 226 | CONFIG_EXT2_FS=y | 315 | CONFIG_EXT2_FS=y |
| 227 | CONFIG_EXT3_FS=y | 316 | CONFIG_EXT3_FS=y |
| 228 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 317 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
| 229 | # CONFIG_EXT3_FS_XATTR is not set | 318 | # CONFIG_EXT3_FS_XATTR is not set |
| 319 | CONFIG_EXT4_FS=y | ||
| 230 | CONFIG_REISERFS_FS=m | 320 | CONFIG_REISERFS_FS=m |
| 231 | CONFIG_JFS_FS=m | 321 | CONFIG_JFS_FS=m |
| 232 | CONFIG_XFS_FS=m | 322 | CONFIG_XFS_FS=m |
| 233 | CONFIG_OCFS2_FS=m | 323 | CONFIG_OCFS2_FS=m |
| 234 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 235 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 324 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 325 | CONFIG_FANOTIFY=y | ||
| 236 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 326 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 237 | # CONFIG_PRINT_QUOTA_WARNING is not set | 327 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 238 | CONFIG_AUTOFS_FS=m | ||
| 239 | CONFIG_AUTOFS4_FS=m | 328 | CONFIG_AUTOFS4_FS=m |
| 240 | CONFIG_FUSE_FS=m | 329 | CONFIG_FUSE_FS=m |
| 330 | CONFIG_CUSE=m | ||
| 241 | CONFIG_ISO9660_FS=y | 331 | CONFIG_ISO9660_FS=y |
| 242 | CONFIG_JOLIET=y | 332 | CONFIG_JOLIET=y |
| 243 | CONFIG_ZISOFS=y | 333 | CONFIG_ZISOFS=y |
| 244 | CONFIG_UDF_FS=m | 334 | CONFIG_UDF_FS=m |
| 245 | CONFIG_MSDOS_FS=y | 335 | CONFIG_MSDOS_FS=m |
| 246 | CONFIG_VFAT_FS=m | 336 | CONFIG_VFAT_FS=m |
| 247 | CONFIG_PROC_KCORE=y | 337 | CONFIG_PROC_KCORE=y |
| 248 | CONFIG_TMPFS=y | 338 | CONFIG_TMPFS=y |
| 249 | CONFIG_AFFS_FS=m | 339 | CONFIG_AFFS_FS=m |
| 340 | CONFIG_ECRYPT_FS=m | ||
| 341 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
| 250 | CONFIG_HFS_FS=m | 342 | CONFIG_HFS_FS=m |
| 251 | CONFIG_HFSPLUS_FS=m | 343 | CONFIG_HFSPLUS_FS=m |
| 252 | CONFIG_CRAMFS=m | 344 | CONFIG_CRAMFS=m |
| 253 | CONFIG_SQUASHFS=m | 345 | CONFIG_SQUASHFS=m |
| 254 | CONFIG_MINIX_FS=y | 346 | CONFIG_SQUASHFS_LZO=y |
| 347 | CONFIG_MINIX_FS=m | ||
| 348 | CONFIG_OMFS_FS=m | ||
| 255 | CONFIG_HPFS_FS=m | 349 | CONFIG_HPFS_FS=m |
| 350 | CONFIG_QNX4FS_FS=m | ||
| 351 | CONFIG_QNX6FS_FS=m | ||
| 256 | CONFIG_SYSV_FS=m | 352 | CONFIG_SYSV_FS=m |
| 257 | CONFIG_UFS_FS=m | 353 | CONFIG_UFS_FS=m |
| 258 | CONFIG_NFS_FS=y | 354 | CONFIG_NFS_FS=y |
| 259 | CONFIG_NFS_V3=y | ||
| 260 | CONFIG_NFS_V4=y | 355 | CONFIG_NFS_V4=y |
| 356 | CONFIG_NFS_SWAP=y | ||
| 357 | CONFIG_ROOT_NFS=y | ||
| 261 | CONFIG_NFSD=m | 358 | CONFIG_NFSD=m |
| 262 | CONFIG_NFSD_V3=y | 359 | CONFIG_NFSD_V3=y |
| 263 | CONFIG_SMB_FS=m | 360 | CONFIG_CIFS=m |
| 264 | CONFIG_SMB_NLS_DEFAULT=y | 361 | # CONFIG_CIFS_DEBUG is not set |
| 265 | CONFIG_CODA_FS=m | 362 | CONFIG_CODA_FS=m |
| 266 | CONFIG_NLS_CODEPAGE_437=y | 363 | CONFIG_NLS_CODEPAGE_437=y |
| 267 | CONFIG_NLS_CODEPAGE_737=m | 364 | CONFIG_NLS_CODEPAGE_737=m |
| @@ -300,10 +397,23 @@ CONFIG_NLS_ISO8859_14=m | |||
| 300 | CONFIG_NLS_ISO8859_15=m | 397 | CONFIG_NLS_ISO8859_15=m |
| 301 | CONFIG_NLS_KOI8_R=m | 398 | CONFIG_NLS_KOI8_R=m |
| 302 | CONFIG_NLS_KOI8_U=m | 399 | CONFIG_NLS_KOI8_U=m |
| 400 | CONFIG_NLS_MAC_ROMAN=m | ||
| 401 | CONFIG_NLS_MAC_CELTIC=m | ||
| 402 | CONFIG_NLS_MAC_CENTEURO=m | ||
| 403 | CONFIG_NLS_MAC_CROATIAN=m | ||
| 404 | CONFIG_NLS_MAC_CYRILLIC=m | ||
| 405 | CONFIG_NLS_MAC_GAELIC=m | ||
| 406 | CONFIG_NLS_MAC_GREEK=m | ||
| 407 | CONFIG_NLS_MAC_ICELAND=m | ||
| 408 | CONFIG_NLS_MAC_INUIT=m | ||
| 409 | CONFIG_NLS_MAC_ROMANIAN=m | ||
| 410 | CONFIG_NLS_MAC_TURKISH=m | ||
| 303 | CONFIG_DLM=m | 411 | CONFIG_DLM=m |
| 304 | CONFIG_MAGIC_SYSRQ=y | 412 | CONFIG_MAGIC_SYSRQ=y |
| 305 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 413 | CONFIG_ASYNC_RAID6_TEST=m |
| 306 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 414 | CONFIG_ENCRYPTED_KEYS=m |
| 415 | CONFIG_CRYPTO_MANAGER=y | ||
| 416 | CONFIG_CRYPTO_USER=m | ||
| 307 | CONFIG_CRYPTO_NULL=m | 417 | CONFIG_CRYPTO_NULL=m |
| 308 | CONFIG_CRYPTO_CRYPTD=m | 418 | CONFIG_CRYPTO_CRYPTD=m |
| 309 | CONFIG_CRYPTO_TEST=m | 419 | CONFIG_CRYPTO_TEST=m |
| @@ -313,19 +423,16 @@ CONFIG_CRYPTO_CTS=m | |||
| 313 | CONFIG_CRYPTO_LRW=m | 423 | CONFIG_CRYPTO_LRW=m |
| 314 | CONFIG_CRYPTO_PCBC=m | 424 | CONFIG_CRYPTO_PCBC=m |
| 315 | CONFIG_CRYPTO_XTS=m | 425 | CONFIG_CRYPTO_XTS=m |
| 316 | CONFIG_CRYPTO_HMAC=y | ||
| 317 | CONFIG_CRYPTO_XCBC=m | 426 | CONFIG_CRYPTO_XCBC=m |
| 318 | CONFIG_CRYPTO_MD4=m | 427 | CONFIG_CRYPTO_VMAC=m |
| 319 | CONFIG_CRYPTO_MICHAEL_MIC=m | 428 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 320 | CONFIG_CRYPTO_RMD128=m | 429 | CONFIG_CRYPTO_RMD128=m |
| 321 | CONFIG_CRYPTO_RMD160=m | 430 | CONFIG_CRYPTO_RMD160=m |
| 322 | CONFIG_CRYPTO_RMD256=m | 431 | CONFIG_CRYPTO_RMD256=m |
| 323 | CONFIG_CRYPTO_RMD320=m | 432 | CONFIG_CRYPTO_RMD320=m |
| 324 | CONFIG_CRYPTO_SHA256=m | ||
| 325 | CONFIG_CRYPTO_SHA512=m | 433 | CONFIG_CRYPTO_SHA512=m |
| 326 | CONFIG_CRYPTO_TGR192=m | 434 | CONFIG_CRYPTO_TGR192=m |
| 327 | CONFIG_CRYPTO_WP512=m | 435 | CONFIG_CRYPTO_WP512=m |
| 328 | CONFIG_CRYPTO_AES=m | ||
| 329 | CONFIG_CRYPTO_ANUBIS=m | 436 | CONFIG_CRYPTO_ANUBIS=m |
| 330 | CONFIG_CRYPTO_BLOWFISH=m | 437 | CONFIG_CRYPTO_BLOWFISH=m |
| 331 | CONFIG_CRYPTO_CAMELLIA=m | 438 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -341,6 +448,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
| 341 | CONFIG_CRYPTO_ZLIB=m | 448 | CONFIG_CRYPTO_ZLIB=m |
| 342 | CONFIG_CRYPTO_LZO=m | 449 | CONFIG_CRYPTO_LZO=m |
| 343 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 450 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 451 | CONFIG_CRYPTO_USER_API_HASH=m | ||
| 452 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
| 344 | # CONFIG_CRYPTO_HW is not set | 453 | # CONFIG_CRYPTO_HW is not set |
| 345 | CONFIG_CRC16=m | ||
| 346 | CONFIG_CRC_T10DIF=y | 454 | CONFIG_CRC_T10DIF=y |
| 455 | CONFIG_XZ_DEC_X86=y | ||
| 456 | CONFIG_XZ_DEC_POWERPC=y | ||
| 457 | CONFIG_XZ_DEC_IA64=y | ||
| 458 | CONFIG_XZ_DEC_ARM=y | ||
| 459 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
| 460 | CONFIG_XZ_DEC_SPARC=y | ||
| 461 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index ca6c0b4cab77..54674d61e001 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig | |||
| @@ -1,50 +1,71 @@ | |||
| 1 | CONFIG_EXPERIMENTAL=y | ||
| 2 | CONFIG_LOCALVERSION="-sun3" | 1 | CONFIG_LOCALVERSION="-sun3" |
| 3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
| 4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
| 4 | CONFIG_FHANDLE=y | ||
| 5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
| 6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
| 7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
| 8 | # CONFIG_UTS_NS is not set | ||
| 9 | # CONFIG_IPC_NS is not set | ||
| 10 | # CONFIG_PID_NS is not set | ||
| 11 | # CONFIG_NET_NS is not set | ||
| 8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
| 9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
| 11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
| 12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
| 16 | CONFIG_PARTITION_ADVANCED=y | ||
| 17 | CONFIG_AMIGA_PARTITION=y | ||
| 18 | CONFIG_ATARI_PARTITION=y | ||
| 19 | CONFIG_MAC_PARTITION=y | ||
| 20 | CONFIG_BSD_DISKLABEL=y | ||
| 21 | CONFIG_MINIX_SUBPARTITION=y | ||
| 22 | CONFIG_SOLARIS_X86_PARTITION=y | ||
| 23 | CONFIG_UNIXWARE_DISKLABEL=y | ||
| 24 | # CONFIG_EFI_PARTITION is not set | ||
| 25 | CONFIG_SYSV68_PARTITION=y | ||
| 26 | CONFIG_IOSCHED_DEADLINE=m | ||
| 13 | CONFIG_SUN3=y | 27 | CONFIG_SUN3=y |
| 28 | # CONFIG_COMPACTION is not set | ||
| 29 | CONFIG_CLEANCACHE=y | ||
| 30 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 14 | CONFIG_BINFMT_AOUT=m | 31 | CONFIG_BINFMT_AOUT=m |
| 15 | CONFIG_BINFMT_MISC=m | 32 | CONFIG_BINFMT_MISC=m |
| 16 | CONFIG_PROC_HARDWARE=y | ||
| 17 | CONFIG_NET=y | 33 | CONFIG_NET=y |
| 18 | CONFIG_PACKET=y | 34 | CONFIG_PACKET=y |
| 35 | CONFIG_PACKET_DIAG=m | ||
| 19 | CONFIG_UNIX=y | 36 | CONFIG_UNIX=y |
| 37 | CONFIG_UNIX_DIAG=m | ||
| 38 | CONFIG_XFRM_MIGRATE=y | ||
| 20 | CONFIG_NET_KEY=y | 39 | CONFIG_NET_KEY=y |
| 21 | CONFIG_NET_KEY_MIGRATE=y | ||
| 22 | CONFIG_INET=y | 40 | CONFIG_INET=y |
| 23 | CONFIG_IP_PNP=y | 41 | CONFIG_IP_PNP=y |
| 24 | CONFIG_IP_PNP_DHCP=y | 42 | CONFIG_IP_PNP_DHCP=y |
| 25 | CONFIG_IP_PNP_BOOTP=y | 43 | CONFIG_IP_PNP_BOOTP=y |
| 26 | CONFIG_IP_PNP_RARP=y | 44 | CONFIG_IP_PNP_RARP=y |
| 27 | CONFIG_NET_IPIP=m | 45 | CONFIG_NET_IPIP=m |
| 46 | CONFIG_NET_IPGRE_DEMUX=m | ||
| 28 | CONFIG_NET_IPGRE=m | 47 | CONFIG_NET_IPGRE=m |
| 29 | CONFIG_SYN_COOKIES=y | 48 | CONFIG_SYN_COOKIES=y |
| 49 | CONFIG_NET_IPVTI=m | ||
| 30 | CONFIG_INET_AH=m | 50 | CONFIG_INET_AH=m |
| 31 | CONFIG_INET_ESP=m | 51 | CONFIG_INET_ESP=m |
| 32 | CONFIG_INET_IPCOMP=m | 52 | CONFIG_INET_IPCOMP=m |
| 33 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 53 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 34 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 54 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 35 | CONFIG_INET_XFRM_MODE_BEET=m | 55 | CONFIG_INET_XFRM_MODE_BEET=m |
| 56 | # CONFIG_INET_LRO is not set | ||
| 36 | CONFIG_INET_DIAG=m | 57 | CONFIG_INET_DIAG=m |
| 58 | CONFIG_INET_UDP_DIAG=m | ||
| 37 | CONFIG_IPV6_PRIVACY=y | 59 | CONFIG_IPV6_PRIVACY=y |
| 38 | CONFIG_IPV6_ROUTER_PREF=y | 60 | CONFIG_IPV6_ROUTER_PREF=y |
| 39 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 40 | CONFIG_INET6_AH=m | 61 | CONFIG_INET6_AH=m |
| 41 | CONFIG_INET6_ESP=m | 62 | CONFIG_INET6_ESP=m |
| 42 | CONFIG_INET6_IPCOMP=m | 63 | CONFIG_INET6_IPCOMP=m |
| 43 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 64 | CONFIG_IPV6_GRE=m |
| 44 | CONFIG_IPV6_TUNNEL=m | ||
| 45 | CONFIG_NETFILTER=y | 65 | CONFIG_NETFILTER=y |
| 46 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
| 47 | CONFIG_NF_CONNTRACK=m | 66 | CONFIG_NF_CONNTRACK=m |
| 67 | CONFIG_NF_CONNTRACK_ZONES=y | ||
| 68 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
| 48 | # CONFIG_NF_CT_PROTO_DCCP is not set | 69 | # CONFIG_NF_CT_PROTO_DCCP is not set |
| 49 | CONFIG_NF_CT_PROTO_UDPLITE=m | 70 | CONFIG_NF_CT_PROTO_UDPLITE=m |
| 50 | CONFIG_NF_CONNTRACK_AMANDA=m | 71 | CONFIG_NF_CONNTRACK_AMANDA=m |
| @@ -52,25 +73,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
| 52 | CONFIG_NF_CONNTRACK_H323=m | 73 | CONFIG_NF_CONNTRACK_H323=m |
| 53 | CONFIG_NF_CONNTRACK_IRC=m | 74 | CONFIG_NF_CONNTRACK_IRC=m |
| 54 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 75 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
| 76 | CONFIG_NF_CONNTRACK_SNMP=m | ||
| 55 | CONFIG_NF_CONNTRACK_PPTP=m | 77 | CONFIG_NF_CONNTRACK_PPTP=m |
| 56 | CONFIG_NF_CONNTRACK_SANE=m | 78 | CONFIG_NF_CONNTRACK_SANE=m |
| 57 | CONFIG_NF_CONNTRACK_SIP=m | 79 | CONFIG_NF_CONNTRACK_SIP=m |
| 58 | CONFIG_NF_CONNTRACK_TFTP=m | 80 | CONFIG_NF_CONNTRACK_TFTP=m |
| 81 | CONFIG_NETFILTER_XT_SET=m | ||
| 82 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
| 59 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 83 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 60 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 84 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 61 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 85 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 86 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
| 87 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
| 88 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
| 62 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 89 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 63 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 90 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 64 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 91 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 92 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
| 93 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
| 65 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 94 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 66 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 95 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 67 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 96 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 97 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
| 98 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
| 68 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 99 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
| 69 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 100 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 70 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 101 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 102 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
| 71 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 103 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| 72 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 104 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 73 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 105 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 106 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
| 74 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 107 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 75 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 108 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 76 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 109 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| @@ -81,6 +114,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
| 81 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 114 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 82 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 115 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 83 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 116 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
| 117 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
| 118 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
| 84 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 119 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 85 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 120 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 86 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 121 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| @@ -94,22 +129,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 94 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 129 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 95 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 130 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 96 | CONFIG_NETFILTER_XT_MATCH_U32=m | 131 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 132 | CONFIG_IP_SET=m | ||
| 133 | CONFIG_IP_SET_BITMAP_IP=m | ||
| 134 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
| 135 | CONFIG_IP_SET_BITMAP_PORT=m | ||
| 136 | CONFIG_IP_SET_HASH_IP=m | ||
| 137 | CONFIG_IP_SET_HASH_IPPORT=m | ||
| 138 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
| 139 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
| 140 | CONFIG_IP_SET_HASH_NET=m | ||
| 141 | CONFIG_IP_SET_HASH_NETPORT=m | ||
| 142 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
| 143 | CONFIG_IP_SET_LIST_SET=m | ||
| 97 | CONFIG_NF_CONNTRACK_IPV4=m | 144 | CONFIG_NF_CONNTRACK_IPV4=m |
| 98 | CONFIG_IP_NF_QUEUE=m | ||
| 99 | CONFIG_IP_NF_IPTABLES=m | 145 | CONFIG_IP_NF_IPTABLES=m |
| 100 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 101 | CONFIG_IP_NF_MATCH_AH=m | 146 | CONFIG_IP_NF_MATCH_AH=m |
| 102 | CONFIG_IP_NF_MATCH_ECN=m | 147 | CONFIG_IP_NF_MATCH_ECN=m |
| 148 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
| 103 | CONFIG_IP_NF_MATCH_TTL=m | 149 | CONFIG_IP_NF_MATCH_TTL=m |
| 104 | CONFIG_IP_NF_FILTER=m | 150 | CONFIG_IP_NF_FILTER=m |
| 105 | CONFIG_IP_NF_TARGET_REJECT=m | 151 | CONFIG_IP_NF_TARGET_REJECT=m |
| 106 | CONFIG_IP_NF_TARGET_LOG=m | ||
| 107 | CONFIG_IP_NF_TARGET_ULOG=m | 152 | CONFIG_IP_NF_TARGET_ULOG=m |
| 108 | CONFIG_NF_NAT=m | 153 | CONFIG_NF_NAT_IPV4=m |
| 109 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 154 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 110 | CONFIG_IP_NF_TARGET_NETMAP=m | 155 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 111 | CONFIG_IP_NF_TARGET_REDIRECT=m | 156 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 112 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
| 113 | CONFIG_IP_NF_MANGLE=m | 157 | CONFIG_IP_NF_MANGLE=m |
| 114 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 158 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
| 115 | CONFIG_IP_NF_TARGET_ECN=m | 159 | CONFIG_IP_NF_TARGET_ECN=m |
| @@ -119,7 +163,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
| 119 | CONFIG_IP_NF_ARPFILTER=m | 163 | CONFIG_IP_NF_ARPFILTER=m |
| 120 | CONFIG_IP_NF_ARP_MANGLE=m | 164 | CONFIG_IP_NF_ARP_MANGLE=m |
| 121 | CONFIG_NF_CONNTRACK_IPV6=m | 165 | CONFIG_NF_CONNTRACK_IPV6=m |
| 122 | CONFIG_IP6_NF_QUEUE=m | ||
| 123 | CONFIG_IP6_NF_IPTABLES=m | 166 | CONFIG_IP6_NF_IPTABLES=m |
| 124 | CONFIG_IP6_NF_MATCH_AH=m | 167 | CONFIG_IP6_NF_MATCH_AH=m |
| 125 | CONFIG_IP6_NF_MATCH_EUI64=m | 168 | CONFIG_IP6_NF_MATCH_EUI64=m |
| @@ -128,21 +171,34 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
| 128 | CONFIG_IP6_NF_MATCH_HL=m | 171 | CONFIG_IP6_NF_MATCH_HL=m |
| 129 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 172 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 130 | CONFIG_IP6_NF_MATCH_MH=m | 173 | CONFIG_IP6_NF_MATCH_MH=m |
| 174 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
| 131 | CONFIG_IP6_NF_MATCH_RT=m | 175 | CONFIG_IP6_NF_MATCH_RT=m |
| 132 | CONFIG_IP6_NF_TARGET_HL=m | 176 | CONFIG_IP6_NF_TARGET_HL=m |
| 133 | CONFIG_IP6_NF_TARGET_LOG=m | ||
| 134 | CONFIG_IP6_NF_FILTER=m | 177 | CONFIG_IP6_NF_FILTER=m |
| 135 | CONFIG_IP6_NF_TARGET_REJECT=m | 178 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 136 | CONFIG_IP6_NF_MANGLE=m | 179 | CONFIG_IP6_NF_MANGLE=m |
| 137 | CONFIG_IP6_NF_RAW=m | 180 | CONFIG_IP6_NF_RAW=m |
| 181 | CONFIG_NF_NAT_IPV6=m | ||
| 182 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
| 183 | CONFIG_IP6_NF_TARGET_NPT=m | ||
| 138 | CONFIG_IP_DCCP=m | 184 | CONFIG_IP_DCCP=m |
| 139 | # CONFIG_IP_DCCP_CCID3 is not set | 185 | # CONFIG_IP_DCCP_CCID3 is not set |
| 186 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
| 187 | CONFIG_RDS=m | ||
| 188 | CONFIG_RDS_TCP=m | ||
| 189 | CONFIG_L2TP=m | ||
| 140 | CONFIG_ATALK=m | 190 | CONFIG_ATALK=m |
| 191 | CONFIG_BATMAN_ADV=m | ||
| 192 | CONFIG_BATMAN_ADV_DAT=y | ||
| 193 | # CONFIG_WIRELESS is not set | ||
| 141 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 194 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 195 | CONFIG_DEVTMPFS=y | ||
| 142 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 196 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
| 197 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
| 143 | CONFIG_CONNECTOR=m | 198 | CONFIG_CONNECTOR=m |
| 144 | CONFIG_BLK_DEV_LOOP=y | 199 | CONFIG_BLK_DEV_LOOP=y |
| 145 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 200 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
| 201 | CONFIG_BLK_DEV_DRBD=m | ||
| 146 | CONFIG_BLK_DEV_NBD=m | 202 | CONFIG_BLK_DEV_NBD=m |
| 147 | CONFIG_BLK_DEV_RAM=y | 203 | CONFIG_BLK_DEV_RAM=y |
| 148 | CONFIG_CDROM_PKTCDVD=m | 204 | CONFIG_CDROM_PKTCDVD=m |
| @@ -157,107 +213,136 @@ CONFIG_BLK_DEV_SR=y | |||
| 157 | CONFIG_BLK_DEV_SR_VENDOR=y | 213 | CONFIG_BLK_DEV_SR_VENDOR=y |
| 158 | CONFIG_CHR_DEV_SG=m | 214 | CONFIG_CHR_DEV_SG=m |
| 159 | CONFIG_SCSI_CONSTANTS=y | 215 | CONFIG_SCSI_CONSTANTS=y |
| 160 | CONFIG_SCSI_SAS_LIBSAS=m | 216 | CONFIG_SCSI_SAS_ATTRS=m |
| 161 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
| 162 | CONFIG_SCSI_SRP_ATTRS=m | ||
| 163 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
| 164 | CONFIG_ISCSI_TCP=m | 217 | CONFIG_ISCSI_TCP=m |
| 218 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
| 165 | CONFIG_SUN3_SCSI=y | 219 | CONFIG_SUN3_SCSI=y |
| 166 | CONFIG_MD=y | 220 | CONFIG_MD=y |
| 167 | CONFIG_BLK_DEV_MD=m | ||
| 168 | CONFIG_MD_LINEAR=m | 221 | CONFIG_MD_LINEAR=m |
| 169 | CONFIG_MD_RAID0=m | 222 | CONFIG_MD_RAID0=m |
| 170 | CONFIG_MD_RAID1=m | ||
| 171 | CONFIG_MD_RAID456=m | ||
| 172 | CONFIG_BLK_DEV_DM=m | 223 | CONFIG_BLK_DEV_DM=m |
| 173 | CONFIG_DM_CRYPT=m | 224 | CONFIG_DM_CRYPT=m |
| 174 | CONFIG_DM_SNAPSHOT=m | 225 | CONFIG_DM_SNAPSHOT=m |
| 226 | CONFIG_DM_THIN_PROVISIONING=m | ||
| 227 | CONFIG_DM_CACHE=m | ||
| 175 | CONFIG_DM_MIRROR=m | 228 | CONFIG_DM_MIRROR=m |
| 229 | CONFIG_DM_RAID=m | ||
| 176 | CONFIG_DM_ZERO=m | 230 | CONFIG_DM_ZERO=m |
| 177 | CONFIG_DM_MULTIPATH=m | 231 | CONFIG_DM_MULTIPATH=m |
| 178 | CONFIG_DM_UEVENT=y | 232 | CONFIG_DM_UEVENT=y |
| 233 | CONFIG_TARGET_CORE=m | ||
| 234 | CONFIG_TCM_IBLOCK=m | ||
| 235 | CONFIG_TCM_FILEIO=m | ||
| 236 | CONFIG_TCM_PSCSI=m | ||
| 179 | CONFIG_NETDEVICES=y | 237 | CONFIG_NETDEVICES=y |
| 180 | CONFIG_DUMMY=m | 238 | CONFIG_DUMMY=m |
| 181 | CONFIG_MACVLAN=m | ||
| 182 | CONFIG_EQUALIZER=m | 239 | CONFIG_EQUALIZER=m |
| 240 | CONFIG_NET_TEAM=m | ||
| 241 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
| 242 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
| 243 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
| 244 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
| 245 | CONFIG_VXLAN=m | ||
| 246 | CONFIG_NETCONSOLE=m | ||
| 247 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
| 183 | CONFIG_VETH=m | 248 | CONFIG_VETH=m |
| 184 | CONFIG_NET_ETHERNET=y | ||
| 185 | CONFIG_SUN3LANCE=y | 249 | CONFIG_SUN3LANCE=y |
| 250 | # CONFIG_NET_CADENCE is not set | ||
| 186 | CONFIG_SUN3_82586=y | 251 | CONFIG_SUN3_82586=y |
| 187 | # CONFIG_NETDEV_1000 is not set | 252 | # CONFIG_NET_VENDOR_MARVELL is not set |
| 188 | # CONFIG_NETDEV_10000 is not set | 253 | # CONFIG_NET_VENDOR_MICREL is not set |
| 254 | # CONFIG_NET_VENDOR_NATSEMI is not set | ||
| 255 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
| 256 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
| 257 | # CONFIG_NET_VENDOR_SUN is not set | ||
| 258 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
| 189 | CONFIG_PPP=m | 259 | CONFIG_PPP=m |
| 190 | CONFIG_PPP_FILTER=y | ||
| 191 | CONFIG_PPP_ASYNC=m | ||
| 192 | CONFIG_PPP_SYNC_TTY=m | ||
| 193 | CONFIG_PPP_DEFLATE=m | ||
| 194 | CONFIG_PPP_BSDCOMP=m | 260 | CONFIG_PPP_BSDCOMP=m |
| 261 | CONFIG_PPP_DEFLATE=m | ||
| 262 | CONFIG_PPP_FILTER=y | ||
| 195 | CONFIG_PPP_MPPE=m | 263 | CONFIG_PPP_MPPE=m |
| 196 | CONFIG_PPPOE=m | 264 | CONFIG_PPPOE=m |
| 265 | CONFIG_PPTP=m | ||
| 266 | CONFIG_PPPOL2TP=m | ||
| 267 | CONFIG_PPP_ASYNC=m | ||
| 268 | CONFIG_PPP_SYNC_TTY=m | ||
| 197 | CONFIG_SLIP=m | 269 | CONFIG_SLIP=m |
| 198 | CONFIG_SLIP_COMPRESSED=y | 270 | CONFIG_SLIP_COMPRESSED=y |
| 199 | CONFIG_SLIP_SMART=y | 271 | CONFIG_SLIP_SMART=y |
| 200 | CONFIG_SLIP_MODE_SLIP6=y | 272 | CONFIG_SLIP_MODE_SLIP6=y |
| 201 | CONFIG_NETCONSOLE=m | 273 | # CONFIG_WLAN is not set |
| 202 | CONFIG_NETCONSOLE_DYNAMIC=y | 274 | CONFIG_INPUT_EVDEV=m |
| 203 | CONFIG_INPUT_FF_MEMLESS=m | ||
| 204 | # CONFIG_KEYBOARD_ATKBD is not set | 275 | # CONFIG_KEYBOARD_ATKBD is not set |
| 205 | CONFIG_KEYBOARD_SUNKBD=y | 276 | CONFIG_KEYBOARD_SUNKBD=y |
| 206 | CONFIG_MOUSE_PS2=m | 277 | # CONFIG_MOUSE_PS2 is not set |
| 207 | CONFIG_MOUSE_SERIAL=m | 278 | CONFIG_MOUSE_SERIAL=m |
| 208 | # CONFIG_SERIO_SERPORT is not set | ||
| 209 | CONFIG_VT_HW_CONSOLE_BINDING=y | 279 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 280 | # CONFIG_LEGACY_PTYS is not set | ||
| 210 | # CONFIG_DEVKMEM is not set | 281 | # CONFIG_DEVKMEM is not set |
| 211 | # CONFIG_HW_RANDOM is not set | 282 | # CONFIG_HW_RANDOM is not set |
| 212 | CONFIG_GEN_RTC=m | 283 | CONFIG_NTP_PPS=y |
| 213 | CONFIG_GEN_RTC_X=y | 284 | CONFIG_PPS_CLIENT_LDISC=m |
| 285 | CONFIG_PTP_1588_CLOCK=m | ||
| 214 | # CONFIG_HWMON is not set | 286 | # CONFIG_HWMON is not set |
| 215 | CONFIG_FB=y | 287 | CONFIG_FB=y |
| 216 | CONFIG_FRAMEBUFFER_CONSOLE=y | 288 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 217 | CONFIG_LOGO=y | 289 | CONFIG_LOGO=y |
| 218 | CONFIG_HID=m | 290 | CONFIG_HID=m |
| 219 | CONFIG_HIDRAW=y | 291 | CONFIG_HIDRAW=y |
| 292 | CONFIG_UHID=m | ||
| 293 | # CONFIG_HID_GENERIC is not set | ||
| 220 | # CONFIG_USB_SUPPORT is not set | 294 | # CONFIG_USB_SUPPORT is not set |
| 295 | CONFIG_RTC_CLASS=y | ||
| 296 | CONFIG_RTC_DRV_GENERIC=m | ||
| 297 | # CONFIG_IOMMU_SUPPORT is not set | ||
| 298 | CONFIG_PROC_HARDWARE=y | ||
| 221 | CONFIG_EXT2_FS=y | 299 | CONFIG_EXT2_FS=y |
| 222 | CONFIG_EXT3_FS=y | 300 | CONFIG_EXT3_FS=y |
| 223 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 301 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
| 224 | # CONFIG_EXT3_FS_XATTR is not set | 302 | # CONFIG_EXT3_FS_XATTR is not set |
| 303 | CONFIG_EXT4_FS=y | ||
| 225 | CONFIG_REISERFS_FS=m | 304 | CONFIG_REISERFS_FS=m |
| 226 | CONFIG_JFS_FS=m | 305 | CONFIG_JFS_FS=m |
| 227 | CONFIG_XFS_FS=m | 306 | CONFIG_XFS_FS=m |
| 228 | CONFIG_OCFS2_FS=m | 307 | CONFIG_OCFS2_FS=m |
| 229 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 230 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 308 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 309 | CONFIG_FANOTIFY=y | ||
| 231 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 310 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 232 | # CONFIG_PRINT_QUOTA_WARNING is not set | 311 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 233 | CONFIG_AUTOFS_FS=m | ||
| 234 | CONFIG_AUTOFS4_FS=m | 312 | CONFIG_AUTOFS4_FS=m |
| 235 | CONFIG_FUSE_FS=m | 313 | CONFIG_FUSE_FS=m |
| 314 | CONFIG_CUSE=m | ||
| 236 | CONFIG_ISO9660_FS=y | 315 | CONFIG_ISO9660_FS=y |
| 237 | CONFIG_JOLIET=y | 316 | CONFIG_JOLIET=y |
| 238 | CONFIG_ZISOFS=y | 317 | CONFIG_ZISOFS=y |
| 239 | CONFIG_UDF_FS=m | 318 | CONFIG_UDF_FS=m |
| 240 | CONFIG_MSDOS_FS=y | 319 | CONFIG_MSDOS_FS=m |
| 241 | CONFIG_VFAT_FS=m | 320 | CONFIG_VFAT_FS=m |
| 242 | CONFIG_PROC_KCORE=y | 321 | CONFIG_PROC_KCORE=y |
| 243 | CONFIG_TMPFS=y | 322 | CONFIG_TMPFS=y |
| 244 | CONFIG_AFFS_FS=m | 323 | CONFIG_AFFS_FS=m |
| 324 | CONFIG_ECRYPT_FS=m | ||
| 325 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
| 245 | CONFIG_HFS_FS=m | 326 | CONFIG_HFS_FS=m |
| 246 | CONFIG_HFSPLUS_FS=m | 327 | CONFIG_HFSPLUS_FS=m |
| 247 | CONFIG_CRAMFS=m | 328 | CONFIG_CRAMFS=m |
| 248 | CONFIG_SQUASHFS=m | 329 | CONFIG_SQUASHFS=m |
| 249 | CONFIG_MINIX_FS=y | 330 | CONFIG_SQUASHFS_LZO=y |
| 331 | CONFIG_MINIX_FS=m | ||
| 332 | CONFIG_OMFS_FS=m | ||
| 250 | CONFIG_HPFS_FS=m | 333 | CONFIG_HPFS_FS=m |
| 334 | CONFIG_QNX4FS_FS=m | ||
| 335 | CONFIG_QNX6FS_FS=m | ||
| 251 | CONFIG_SYSV_FS=m | 336 | CONFIG_SYSV_FS=m |
| 252 | CONFIG_UFS_FS=m | 337 | CONFIG_UFS_FS=m |
| 253 | CONFIG_NFS_FS=y | 338 | CONFIG_NFS_FS=y |
| 254 | CONFIG_NFS_V3=y | ||
| 255 | CONFIG_NFS_V4=y | 339 | CONFIG_NFS_V4=y |
| 340 | CONFIG_NFS_SWAP=y | ||
| 256 | CONFIG_ROOT_NFS=y | 341 | CONFIG_ROOT_NFS=y |
| 257 | CONFIG_NFSD=m | 342 | CONFIG_NFSD=m |
| 258 | CONFIG_NFSD_V3=y | 343 | CONFIG_NFSD_V3=y |
| 259 | CONFIG_SMB_FS=m | 344 | CONFIG_CIFS=m |
| 260 | CONFIG_SMB_NLS_DEFAULT=y | 345 | # CONFIG_CIFS_DEBUG is not set |
| 261 | CONFIG_CODA_FS=m | 346 | CONFIG_CODA_FS=m |
| 262 | CONFIG_NLS_CODEPAGE_437=y | 347 | CONFIG_NLS_CODEPAGE_437=y |
| 263 | CONFIG_NLS_CODEPAGE_737=m | 348 | CONFIG_NLS_CODEPAGE_737=m |
| @@ -296,10 +381,23 @@ CONFIG_NLS_ISO8859_14=m | |||
| 296 | CONFIG_NLS_ISO8859_15=m | 381 | CONFIG_NLS_ISO8859_15=m |
| 297 | CONFIG_NLS_KOI8_R=m | 382 | CONFIG_NLS_KOI8_R=m |
| 298 | CONFIG_NLS_KOI8_U=m | 383 | CONFIG_NLS_KOI8_U=m |
| 384 | CONFIG_NLS_MAC_ROMAN=m | ||
| 385 | CONFIG_NLS_MAC_CELTIC=m | ||
| 386 | CONFIG_NLS_MAC_CENTEURO=m | ||
| 387 | CONFIG_NLS_MAC_CROATIAN=m | ||
| 388 | CONFIG_NLS_MAC_CYRILLIC=m | ||
| 389 | CONFIG_NLS_MAC_GAELIC=m | ||
| 390 | CONFIG_NLS_MAC_GREEK=m | ||
| 391 | CONFIG_NLS_MAC_ICELAND=m | ||
| 392 | CONFIG_NLS_MAC_INUIT=m | ||
| 393 | CONFIG_NLS_MAC_ROMANIAN=m | ||
| 394 | CONFIG_NLS_MAC_TURKISH=m | ||
| 299 | CONFIG_DLM=m | 395 | CONFIG_DLM=m |
| 300 | CONFIG_MAGIC_SYSRQ=y | 396 | CONFIG_MAGIC_SYSRQ=y |
| 301 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 397 | CONFIG_ASYNC_RAID6_TEST=m |
| 302 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 398 | CONFIG_ENCRYPTED_KEYS=m |
| 399 | CONFIG_CRYPTO_MANAGER=y | ||
| 400 | CONFIG_CRYPTO_USER=m | ||
| 303 | CONFIG_CRYPTO_NULL=m | 401 | CONFIG_CRYPTO_NULL=m |
| 304 | CONFIG_CRYPTO_CRYPTD=m | 402 | CONFIG_CRYPTO_CRYPTD=m |
| 305 | CONFIG_CRYPTO_TEST=m | 403 | CONFIG_CRYPTO_TEST=m |
| @@ -309,19 +407,16 @@ CONFIG_CRYPTO_CTS=m | |||
| 309 | CONFIG_CRYPTO_LRW=m | 407 | CONFIG_CRYPTO_LRW=m |
| 310 | CONFIG_CRYPTO_PCBC=m | 408 | CONFIG_CRYPTO_PCBC=m |
| 311 | CONFIG_CRYPTO_XTS=m | 409 | CONFIG_CRYPTO_XTS=m |
| 312 | CONFIG_CRYPTO_HMAC=y | ||
| 313 | CONFIG_CRYPTO_XCBC=m | 410 | CONFIG_CRYPTO_XCBC=m |
| 314 | CONFIG_CRYPTO_MD4=m | 411 | CONFIG_CRYPTO_VMAC=m |
| 315 | CONFIG_CRYPTO_MICHAEL_MIC=m | 412 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 316 | CONFIG_CRYPTO_RMD128=m | 413 | CONFIG_CRYPTO_RMD128=m |
| 317 | CONFIG_CRYPTO_RMD160=m | 414 | CONFIG_CRYPTO_RMD160=m |
| 318 | CONFIG_CRYPTO_RMD256=m | 415 | CONFIG_CRYPTO_RMD256=m |
| 319 | CONFIG_CRYPTO_RMD320=m | 416 | CONFIG_CRYPTO_RMD320=m |
| 320 | CONFIG_CRYPTO_SHA256=m | ||
| 321 | CONFIG_CRYPTO_SHA512=m | 417 | CONFIG_CRYPTO_SHA512=m |
| 322 | CONFIG_CRYPTO_TGR192=m | 418 | CONFIG_CRYPTO_TGR192=m |
| 323 | CONFIG_CRYPTO_WP512=m | 419 | CONFIG_CRYPTO_WP512=m |
| 324 | CONFIG_CRYPTO_AES=m | ||
| 325 | CONFIG_CRYPTO_ANUBIS=m | 420 | CONFIG_CRYPTO_ANUBIS=m |
| 326 | CONFIG_CRYPTO_BLOWFISH=m | 421 | CONFIG_CRYPTO_BLOWFISH=m |
| 327 | CONFIG_CRYPTO_CAMELLIA=m | 422 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -337,6 +432,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
| 337 | CONFIG_CRYPTO_ZLIB=m | 432 | CONFIG_CRYPTO_ZLIB=m |
| 338 | CONFIG_CRYPTO_LZO=m | 433 | CONFIG_CRYPTO_LZO=m |
| 339 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 434 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 435 | CONFIG_CRYPTO_USER_API_HASH=m | ||
| 436 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
| 340 | # CONFIG_CRYPTO_HW is not set | 437 | # CONFIG_CRYPTO_HW is not set |
| 341 | CONFIG_CRC16=m | ||
| 342 | CONFIG_CRC_T10DIF=y | 438 | CONFIG_CRC_T10DIF=y |
| 439 | CONFIG_XZ_DEC_X86=y | ||
| 440 | CONFIG_XZ_DEC_POWERPC=y | ||
| 441 | CONFIG_XZ_DEC_IA64=y | ||
| 442 | CONFIG_XZ_DEC_ARM=y | ||
| 443 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
| 444 | CONFIG_XZ_DEC_SPARC=y | ||
| 445 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index c80941c7759e..832d9539f441 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig | |||
| @@ -1,50 +1,71 @@ | |||
| 1 | CONFIG_EXPERIMENTAL=y | ||
| 2 | CONFIG_LOCALVERSION="-sun3x" | 1 | CONFIG_LOCALVERSION="-sun3x" |
| 3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
| 4 | CONFIG_POSIX_MQUEUE=y | 3 | CONFIG_POSIX_MQUEUE=y |
| 4 | CONFIG_FHANDLE=y | ||
| 5 | CONFIG_BSD_PROCESS_ACCT=y | 5 | CONFIG_BSD_PROCESS_ACCT=y |
| 6 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_BSD_PROCESS_ACCT_V3=y |
| 7 | CONFIG_RELAY=y | 7 | CONFIG_LOG_BUF_SHIFT=16 |
| 8 | # CONFIG_UTS_NS is not set | ||
| 9 | # CONFIG_IPC_NS is not set | ||
| 10 | # CONFIG_PID_NS is not set | ||
| 11 | # CONFIG_NET_NS is not set | ||
| 8 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
| 9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 10 | CONFIG_SLAB=y | 13 | CONFIG_SLAB=y |
| 11 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
| 12 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
| 16 | CONFIG_PARTITION_ADVANCED=y | ||
| 17 | CONFIG_AMIGA_PARTITION=y | ||
| 18 | CONFIG_ATARI_PARTITION=y | ||
| 19 | CONFIG_MAC_PARTITION=y | ||
| 20 | CONFIG_BSD_DISKLABEL=y | ||
| 21 | CONFIG_MINIX_SUBPARTITION=y | ||
| 22 | CONFIG_SOLARIS_X86_PARTITION=y | ||
| 23 | CONFIG_UNIXWARE_DISKLABEL=y | ||
| 24 | # CONFIG_EFI_PARTITION is not set | ||
| 25 | CONFIG_SYSV68_PARTITION=y | ||
| 26 | CONFIG_IOSCHED_DEADLINE=m | ||
| 13 | CONFIG_SUN3X=y | 27 | CONFIG_SUN3X=y |
| 28 | # CONFIG_COMPACTION is not set | ||
| 29 | CONFIG_CLEANCACHE=y | ||
| 30 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 14 | CONFIG_BINFMT_AOUT=m | 31 | CONFIG_BINFMT_AOUT=m |
| 15 | CONFIG_BINFMT_MISC=m | 32 | CONFIG_BINFMT_MISC=m |
| 16 | CONFIG_PROC_HARDWARE=y | ||
| 17 | CONFIG_NET=y | 33 | CONFIG_NET=y |
| 18 | CONFIG_PACKET=y | 34 | CONFIG_PACKET=y |
| 35 | CONFIG_PACKET_DIAG=m | ||
| 19 | CONFIG_UNIX=y | 36 | CONFIG_UNIX=y |
| 37 | CONFIG_UNIX_DIAG=m | ||
| 38 | CONFIG_XFRM_MIGRATE=y | ||
| 20 | CONFIG_NET_KEY=y | 39 | CONFIG_NET_KEY=y |
| 21 | CONFIG_NET_KEY_MIGRATE=y | ||
| 22 | CONFIG_INET=y | 40 | CONFIG_INET=y |
| 23 | CONFIG_IP_PNP=y | 41 | CONFIG_IP_PNP=y |
| 24 | CONFIG_IP_PNP_DHCP=y | 42 | CONFIG_IP_PNP_DHCP=y |
| 25 | CONFIG_IP_PNP_BOOTP=y | 43 | CONFIG_IP_PNP_BOOTP=y |
| 26 | CONFIG_IP_PNP_RARP=y | 44 | CONFIG_IP_PNP_RARP=y |
| 27 | CONFIG_NET_IPIP=m | 45 | CONFIG_NET_IPIP=m |
| 46 | CONFIG_NET_IPGRE_DEMUX=m | ||
| 28 | CONFIG_NET_IPGRE=m | 47 | CONFIG_NET_IPGRE=m |
| 29 | CONFIG_SYN_COOKIES=y | 48 | CONFIG_SYN_COOKIES=y |
| 49 | CONFIG_NET_IPVTI=m | ||
| 30 | CONFIG_INET_AH=m | 50 | CONFIG_INET_AH=m |
| 31 | CONFIG_INET_ESP=m | 51 | CONFIG_INET_ESP=m |
| 32 | CONFIG_INET_IPCOMP=m | 52 | CONFIG_INET_IPCOMP=m |
| 33 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 53 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 34 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 54 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 35 | CONFIG_INET_XFRM_MODE_BEET=m | 55 | CONFIG_INET_XFRM_MODE_BEET=m |
| 56 | # CONFIG_INET_LRO is not set | ||
| 36 | CONFIG_INET_DIAG=m | 57 | CONFIG_INET_DIAG=m |
| 58 | CONFIG_INET_UDP_DIAG=m | ||
| 37 | CONFIG_IPV6_PRIVACY=y | 59 | CONFIG_IPV6_PRIVACY=y |
| 38 | CONFIG_IPV6_ROUTER_PREF=y | 60 | CONFIG_IPV6_ROUTER_PREF=y |
| 39 | CONFIG_IPV6_ROUTE_INFO=y | ||
| 40 | CONFIG_INET6_AH=m | 61 | CONFIG_INET6_AH=m |
| 41 | CONFIG_INET6_ESP=m | 62 | CONFIG_INET6_ESP=m |
| 42 | CONFIG_INET6_IPCOMP=m | 63 | CONFIG_INET6_IPCOMP=m |
| 43 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | 64 | CONFIG_IPV6_GRE=m |
| 44 | CONFIG_IPV6_TUNNEL=m | ||
| 45 | CONFIG_NETFILTER=y | 65 | CONFIG_NETFILTER=y |
| 46 | CONFIG_NETFILTER_NETLINK_QUEUE=m | ||
| 47 | CONFIG_NF_CONNTRACK=m | 66 | CONFIG_NF_CONNTRACK=m |
| 67 | CONFIG_NF_CONNTRACK_ZONES=y | ||
| 68 | # CONFIG_NF_CONNTRACK_PROCFS is not set | ||
| 48 | # CONFIG_NF_CT_PROTO_DCCP is not set | 69 | # CONFIG_NF_CT_PROTO_DCCP is not set |
| 49 | CONFIG_NF_CT_PROTO_UDPLITE=m | 70 | CONFIG_NF_CT_PROTO_UDPLITE=m |
| 50 | CONFIG_NF_CONNTRACK_AMANDA=m | 71 | CONFIG_NF_CONNTRACK_AMANDA=m |
| @@ -52,25 +73,37 @@ CONFIG_NF_CONNTRACK_FTP=m | |||
| 52 | CONFIG_NF_CONNTRACK_H323=m | 73 | CONFIG_NF_CONNTRACK_H323=m |
| 53 | CONFIG_NF_CONNTRACK_IRC=m | 74 | CONFIG_NF_CONNTRACK_IRC=m |
| 54 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | 75 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m |
| 76 | CONFIG_NF_CONNTRACK_SNMP=m | ||
| 55 | CONFIG_NF_CONNTRACK_PPTP=m | 77 | CONFIG_NF_CONNTRACK_PPTP=m |
| 56 | CONFIG_NF_CONNTRACK_SANE=m | 78 | CONFIG_NF_CONNTRACK_SANE=m |
| 57 | CONFIG_NF_CONNTRACK_SIP=m | 79 | CONFIG_NF_CONNTRACK_SIP=m |
| 58 | CONFIG_NF_CONNTRACK_TFTP=m | 80 | CONFIG_NF_CONNTRACK_TFTP=m |
| 81 | CONFIG_NETFILTER_XT_SET=m | ||
| 82 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
| 59 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 83 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 60 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 84 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
| 61 | CONFIG_NETFILTER_XT_TARGET_DSCP=m | 85 | CONFIG_NETFILTER_XT_TARGET_DSCP=m |
| 86 | CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
| 87 | CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
| 88 | CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
| 62 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 89 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 63 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 90 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 64 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 91 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 92 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
| 93 | CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
| 65 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | 94 | CONFIG_NETFILTER_XT_TARGET_TRACE=m |
| 66 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 95 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 67 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | 96 | CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m |
| 97 | CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m | ||
| 98 | CONFIG_NETFILTER_XT_MATCH_BPF=m | ||
| 68 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m | 99 | CONFIG_NETFILTER_XT_MATCH_CLUSTER=m |
| 69 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 100 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 70 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 101 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
| 102 | CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m | ||
| 71 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | 103 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m |
| 72 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 104 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
| 73 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 105 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 106 | CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m | ||
| 74 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | 107 | CONFIG_NETFILTER_XT_MATCH_DSCP=m |
| 75 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 108 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 76 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 109 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
| @@ -81,6 +114,8 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m | |||
| 81 | CONFIG_NETFILTER_XT_MATCH_MAC=m | 114 | CONFIG_NETFILTER_XT_MATCH_MAC=m |
| 82 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 115 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 83 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 116 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
| 117 | CONFIG_NETFILTER_XT_MATCH_NFACCT=m | ||
| 118 | CONFIG_NETFILTER_XT_MATCH_OSF=m | ||
| 84 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | 119 | CONFIG_NETFILTER_XT_MATCH_OWNER=m |
| 85 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 120 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 86 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 121 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| @@ -94,22 +129,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m | |||
| 94 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 129 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 95 | CONFIG_NETFILTER_XT_MATCH_TIME=m | 130 | CONFIG_NETFILTER_XT_MATCH_TIME=m |
| 96 | CONFIG_NETFILTER_XT_MATCH_U32=m | 131 | CONFIG_NETFILTER_XT_MATCH_U32=m |
| 132 | CONFIG_IP_SET=m | ||
| 133 | CONFIG_IP_SET_BITMAP_IP=m | ||
| 134 | CONFIG_IP_SET_BITMAP_IPMAC=m | ||
| 135 | CONFIG_IP_SET_BITMAP_PORT=m | ||
| 136 | CONFIG_IP_SET_HASH_IP=m | ||
| 137 | CONFIG_IP_SET_HASH_IPPORT=m | ||
| 138 | CONFIG_IP_SET_HASH_IPPORTIP=m | ||
| 139 | CONFIG_IP_SET_HASH_IPPORTNET=m | ||
| 140 | CONFIG_IP_SET_HASH_NET=m | ||
| 141 | CONFIG_IP_SET_HASH_NETPORT=m | ||
| 142 | CONFIG_IP_SET_HASH_NETIFACE=m | ||
| 143 | CONFIG_IP_SET_LIST_SET=m | ||
| 97 | CONFIG_NF_CONNTRACK_IPV4=m | 144 | CONFIG_NF_CONNTRACK_IPV4=m |
| 98 | CONFIG_IP_NF_QUEUE=m | ||
| 99 | CONFIG_IP_NF_IPTABLES=m | 145 | CONFIG_IP_NF_IPTABLES=m |
| 100 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 101 | CONFIG_IP_NF_MATCH_AH=m | 146 | CONFIG_IP_NF_MATCH_AH=m |
| 102 | CONFIG_IP_NF_MATCH_ECN=m | 147 | CONFIG_IP_NF_MATCH_ECN=m |
| 148 | CONFIG_IP_NF_MATCH_RPFILTER=m | ||
| 103 | CONFIG_IP_NF_MATCH_TTL=m | 149 | CONFIG_IP_NF_MATCH_TTL=m |
| 104 | CONFIG_IP_NF_FILTER=m | 150 | CONFIG_IP_NF_FILTER=m |
| 105 | CONFIG_IP_NF_TARGET_REJECT=m | 151 | CONFIG_IP_NF_TARGET_REJECT=m |
| 106 | CONFIG_IP_NF_TARGET_LOG=m | ||
| 107 | CONFIG_IP_NF_TARGET_ULOG=m | 152 | CONFIG_IP_NF_TARGET_ULOG=m |
| 108 | CONFIG_NF_NAT=m | 153 | CONFIG_NF_NAT_IPV4=m |
| 109 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 154 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 110 | CONFIG_IP_NF_TARGET_NETMAP=m | 155 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 111 | CONFIG_IP_NF_TARGET_REDIRECT=m | 156 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 112 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
| 113 | CONFIG_IP_NF_MANGLE=m | 157 | CONFIG_IP_NF_MANGLE=m |
| 114 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 158 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
| 115 | CONFIG_IP_NF_TARGET_ECN=m | 159 | CONFIG_IP_NF_TARGET_ECN=m |
| @@ -119,7 +163,6 @@ CONFIG_IP_NF_ARPTABLES=m | |||
| 119 | CONFIG_IP_NF_ARPFILTER=m | 163 | CONFIG_IP_NF_ARPFILTER=m |
| 120 | CONFIG_IP_NF_ARP_MANGLE=m | 164 | CONFIG_IP_NF_ARP_MANGLE=m |
| 121 | CONFIG_NF_CONNTRACK_IPV6=m | 165 | CONFIG_NF_CONNTRACK_IPV6=m |
| 122 | CONFIG_IP6_NF_QUEUE=m | ||
| 123 | CONFIG_IP6_NF_IPTABLES=m | 166 | CONFIG_IP6_NF_IPTABLES=m |
| 124 | CONFIG_IP6_NF_MATCH_AH=m | 167 | CONFIG_IP6_NF_MATCH_AH=m |
| 125 | CONFIG_IP6_NF_MATCH_EUI64=m | 168 | CONFIG_IP6_NF_MATCH_EUI64=m |
| @@ -128,21 +171,34 @@ CONFIG_IP6_NF_MATCH_OPTS=m | |||
| 128 | CONFIG_IP6_NF_MATCH_HL=m | 171 | CONFIG_IP6_NF_MATCH_HL=m |
| 129 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 172 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 130 | CONFIG_IP6_NF_MATCH_MH=m | 173 | CONFIG_IP6_NF_MATCH_MH=m |
| 174 | CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
| 131 | CONFIG_IP6_NF_MATCH_RT=m | 175 | CONFIG_IP6_NF_MATCH_RT=m |
| 132 | CONFIG_IP6_NF_TARGET_HL=m | 176 | CONFIG_IP6_NF_TARGET_HL=m |
| 133 | CONFIG_IP6_NF_TARGET_LOG=m | ||
| 134 | CONFIG_IP6_NF_FILTER=m | 177 | CONFIG_IP6_NF_FILTER=m |
| 135 | CONFIG_IP6_NF_TARGET_REJECT=m | 178 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 136 | CONFIG_IP6_NF_MANGLE=m | 179 | CONFIG_IP6_NF_MANGLE=m |
| 137 | CONFIG_IP6_NF_RAW=m | 180 | CONFIG_IP6_NF_RAW=m |
| 181 | CONFIG_NF_NAT_IPV6=m | ||
| 182 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
| 183 | CONFIG_IP6_NF_TARGET_NPT=m | ||
| 138 | CONFIG_IP_DCCP=m | 184 | CONFIG_IP_DCCP=m |
| 139 | # CONFIG_IP_DCCP_CCID3 is not set | 185 | # CONFIG_IP_DCCP_CCID3 is not set |
| 186 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | ||
| 187 | CONFIG_RDS=m | ||
| 188 | CONFIG_RDS_TCP=m | ||
| 189 | CONFIG_L2TP=m | ||
| 140 | CONFIG_ATALK=m | 190 | CONFIG_ATALK=m |
| 191 | CONFIG_BATMAN_ADV=m | ||
| 192 | CONFIG_BATMAN_ADV_DAT=y | ||
| 193 | # CONFIG_WIRELESS is not set | ||
| 141 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 194 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 195 | CONFIG_DEVTMPFS=y | ||
| 142 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 196 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
| 197 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
| 143 | CONFIG_CONNECTOR=m | 198 | CONFIG_CONNECTOR=m |
| 144 | CONFIG_BLK_DEV_LOOP=y | 199 | CONFIG_BLK_DEV_LOOP=y |
| 145 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 200 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
| 201 | CONFIG_BLK_DEV_DRBD=m | ||
| 146 | CONFIG_BLK_DEV_NBD=m | 202 | CONFIG_BLK_DEV_NBD=m |
| 147 | CONFIG_BLK_DEV_RAM=y | 203 | CONFIG_BLK_DEV_RAM=y |
| 148 | CONFIG_CDROM_PKTCDVD=m | 204 | CONFIG_CDROM_PKTCDVD=m |
| @@ -157,106 +213,136 @@ CONFIG_BLK_DEV_SR=y | |||
| 157 | CONFIG_BLK_DEV_SR_VENDOR=y | 213 | CONFIG_BLK_DEV_SR_VENDOR=y |
| 158 | CONFIG_CHR_DEV_SG=m | 214 | CONFIG_CHR_DEV_SG=m |
| 159 | CONFIG_SCSI_CONSTANTS=y | 215 | CONFIG_SCSI_CONSTANTS=y |
| 160 | CONFIG_SCSI_SAS_LIBSAS=m | 216 | CONFIG_SCSI_SAS_ATTRS=m |
| 161 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | ||
| 162 | CONFIG_SCSI_SRP_ATTRS=m | ||
| 163 | CONFIG_SCSI_SRP_TGT_ATTRS=y | ||
| 164 | CONFIG_ISCSI_TCP=m | 217 | CONFIG_ISCSI_TCP=m |
| 218 | CONFIG_ISCSI_BOOT_SYSFS=m | ||
| 165 | CONFIG_SUN3X_ESP=y | 219 | CONFIG_SUN3X_ESP=y |
| 166 | CONFIG_MD=y | 220 | CONFIG_MD=y |
| 167 | CONFIG_BLK_DEV_MD=m | ||
| 168 | CONFIG_MD_LINEAR=m | 221 | CONFIG_MD_LINEAR=m |
| 169 | CONFIG_MD_RAID0=m | 222 | CONFIG_MD_RAID0=m |
| 170 | CONFIG_MD_RAID1=m | ||
| 171 | CONFIG_MD_RAID456=m | ||
| 172 | CONFIG_BLK_DEV_DM=m | 223 | CONFIG_BLK_DEV_DM=m |
| 173 | CONFIG_DM_CRYPT=m | 224 | CONFIG_DM_CRYPT=m |
| 174 | CONFIG_DM_SNAPSHOT=m | 225 | CONFIG_DM_SNAPSHOT=m |
| 226 | CONFIG_DM_THIN_PROVISIONING=m | ||
| 227 | CONFIG_DM_CACHE=m | ||
| 175 | CONFIG_DM_MIRROR=m | 228 | CONFIG_DM_MIRROR=m |
| 229 | CONFIG_DM_RAID=m | ||
| 176 | CONFIG_DM_ZERO=m | 230 | CONFIG_DM_ZERO=m |
| 177 | CONFIG_DM_MULTIPATH=m | 231 | CONFIG_DM_MULTIPATH=m |
| 178 | CONFIG_DM_UEVENT=y | 232 | CONFIG_DM_UEVENT=y |
| 233 | CONFIG_TARGET_CORE=m | ||
| 234 | CONFIG_TCM_IBLOCK=m | ||
| 235 | CONFIG_TCM_FILEIO=m | ||
| 236 | CONFIG_TCM_PSCSI=m | ||
| 179 | CONFIG_NETDEVICES=y | 237 | CONFIG_NETDEVICES=y |
| 180 | CONFIG_DUMMY=m | 238 | CONFIG_DUMMY=m |
| 181 | CONFIG_MACVLAN=m | ||
| 182 | CONFIG_EQUALIZER=m | 239 | CONFIG_EQUALIZER=m |
| 240 | CONFIG_NET_TEAM=m | ||
| 241 | CONFIG_NET_TEAM_MODE_BROADCAST=m | ||
| 242 | CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | ||
| 243 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | ||
| 244 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | ||
| 245 | CONFIG_VXLAN=m | ||
| 246 | CONFIG_NETCONSOLE=m | ||
| 247 | CONFIG_NETCONSOLE_DYNAMIC=y | ||
| 183 | CONFIG_VETH=m | 248 | CONFIG_VETH=m |
| 184 | CONFIG_NET_ETHERNET=y | ||
| 185 | CONFIG_SUN3LANCE=y | 249 | CONFIG_SUN3LANCE=y |
| 186 | # CONFIG_NETDEV_1000 is not set | 250 | # CONFIG_NET_CADENCE is not set |
| 187 | # CONFIG_NETDEV_10000 is not set | 251 | # CONFIG_NET_VENDOR_BROADCOM is not set |
| 252 | # CONFIG_NET_VENDOR_INTEL is not set | ||
| 253 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
| 254 | # CONFIG_NET_VENDOR_MICREL is not set | ||
| 255 | # CONFIG_NET_VENDOR_NATSEMI is not set | ||
| 256 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
| 257 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
| 258 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
| 188 | CONFIG_PPP=m | 259 | CONFIG_PPP=m |
| 189 | CONFIG_PPP_FILTER=y | ||
| 190 | CONFIG_PPP_ASYNC=m | ||
| 191 | CONFIG_PPP_SYNC_TTY=m | ||
| 192 | CONFIG_PPP_DEFLATE=m | ||
| 193 | CONFIG_PPP_BSDCOMP=m | 260 | CONFIG_PPP_BSDCOMP=m |
| 261 | CONFIG_PPP_DEFLATE=m | ||
| 262 | CONFIG_PPP_FILTER=y | ||
| 194 | CONFIG_PPP_MPPE=m | 263 | CONFIG_PPP_MPPE=m |
| 195 | CONFIG_PPPOE=m | 264 | CONFIG_PPPOE=m |
| 265 | CONFIG_PPTP=m | ||
| 266 | CONFIG_PPPOL2TP=m | ||
| 267 | CONFIG_PPP_ASYNC=m | ||
| 268 | CONFIG_PPP_SYNC_TTY=m | ||
| 196 | CONFIG_SLIP=m | 269 | CONFIG_SLIP=m |
| 197 | CONFIG_SLIP_COMPRESSED=y | 270 | CONFIG_SLIP_COMPRESSED=y |
| 198 | CONFIG_SLIP_SMART=y | 271 | CONFIG_SLIP_SMART=y |
| 199 | CONFIG_SLIP_MODE_SLIP6=y | 272 | CONFIG_SLIP_MODE_SLIP6=y |
| 200 | CONFIG_NETCONSOLE=m | 273 | # CONFIG_WLAN is not set |
| 201 | CONFIG_NETCONSOLE_DYNAMIC=y | 274 | CONFIG_INPUT_EVDEV=m |
| 202 | CONFIG_INPUT_FF_MEMLESS=m | ||
| 203 | # CONFIG_KEYBOARD_ATKBD is not set | 275 | # CONFIG_KEYBOARD_ATKBD is not set |
| 204 | CONFIG_KEYBOARD_SUNKBD=y | 276 | CONFIG_KEYBOARD_SUNKBD=y |
| 205 | CONFIG_MOUSE_PS2=m | 277 | # CONFIG_MOUSE_PS2 is not set |
| 206 | CONFIG_MOUSE_SERIAL=m | 278 | CONFIG_MOUSE_SERIAL=m |
| 207 | # CONFIG_SERIO_SERPORT is not set | ||
| 208 | CONFIG_VT_HW_CONSOLE_BINDING=y | 279 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 280 | # CONFIG_LEGACY_PTYS is not set | ||
| 209 | # CONFIG_DEVKMEM is not set | 281 | # CONFIG_DEVKMEM is not set |
| 210 | # CONFIG_HW_RANDOM is not set | 282 | # CONFIG_HW_RANDOM is not set |
| 211 | CONFIG_GEN_RTC=m | 283 | CONFIG_NTP_PPS=y |
| 212 | CONFIG_GEN_RTC_X=y | 284 | CONFIG_PPS_CLIENT_LDISC=m |
| 285 | CONFIG_PTP_1588_CLOCK=m | ||
| 213 | # CONFIG_HWMON is not set | 286 | # CONFIG_HWMON is not set |
| 214 | CONFIG_FB=y | 287 | CONFIG_FB=y |
| 215 | CONFIG_FRAMEBUFFER_CONSOLE=y | 288 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 216 | CONFIG_LOGO=y | 289 | CONFIG_LOGO=y |
| 217 | CONFIG_HID=m | 290 | CONFIG_HID=m |
| 218 | CONFIG_HIDRAW=y | 291 | CONFIG_HIDRAW=y |
| 292 | CONFIG_UHID=m | ||
| 293 | # CONFIG_HID_GENERIC is not set | ||
| 219 | # CONFIG_USB_SUPPORT is not set | 294 | # CONFIG_USB_SUPPORT is not set |
| 295 | CONFIG_RTC_CLASS=y | ||
| 296 | CONFIG_RTC_DRV_GENERIC=m | ||
| 297 | # CONFIG_IOMMU_SUPPORT is not set | ||
| 298 | CONFIG_PROC_HARDWARE=y | ||
| 220 | CONFIG_EXT2_FS=y | 299 | CONFIG_EXT2_FS=y |
| 221 | CONFIG_EXT3_FS=y | 300 | CONFIG_EXT3_FS=y |
| 222 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 301 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
| 223 | # CONFIG_EXT3_FS_XATTR is not set | 302 | # CONFIG_EXT3_FS_XATTR is not set |
| 303 | CONFIG_EXT4_FS=y | ||
| 224 | CONFIG_REISERFS_FS=m | 304 | CONFIG_REISERFS_FS=m |
| 225 | CONFIG_JFS_FS=m | 305 | CONFIG_JFS_FS=m |
| 226 | CONFIG_XFS_FS=m | 306 | CONFIG_XFS_FS=m |
| 227 | CONFIG_OCFS2_FS=m | 307 | CONFIG_OCFS2_FS=m |
| 228 | # CONFIG_OCFS2_FS_STATS is not set | ||
| 229 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 308 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
| 309 | CONFIG_FANOTIFY=y | ||
| 230 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 310 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 231 | # CONFIG_PRINT_QUOTA_WARNING is not set | 311 | # CONFIG_PRINT_QUOTA_WARNING is not set |
| 232 | CONFIG_AUTOFS_FS=m | ||
| 233 | CONFIG_AUTOFS4_FS=m | 312 | CONFIG_AUTOFS4_FS=m |
| 234 | CONFIG_FUSE_FS=m | 313 | CONFIG_FUSE_FS=m |
| 314 | CONFIG_CUSE=m | ||
| 235 | CONFIG_ISO9660_FS=y | 315 | CONFIG_ISO9660_FS=y |
| 236 | CONFIG_JOLIET=y | 316 | CONFIG_JOLIET=y |
| 237 | CONFIG_ZISOFS=y | 317 | CONFIG_ZISOFS=y |
| 238 | CONFIG_UDF_FS=m | 318 | CONFIG_UDF_FS=m |
| 239 | CONFIG_MSDOS_FS=y | 319 | CONFIG_MSDOS_FS=m |
| 240 | CONFIG_VFAT_FS=m | 320 | CONFIG_VFAT_FS=m |
| 241 | CONFIG_PROC_KCORE=y | 321 | CONFIG_PROC_KCORE=y |
| 242 | CONFIG_TMPFS=y | 322 | CONFIG_TMPFS=y |
| 243 | CONFIG_AFFS_FS=m | 323 | CONFIG_AFFS_FS=m |
| 324 | CONFIG_ECRYPT_FS=m | ||
| 325 | CONFIG_ECRYPT_FS_MESSAGING=y | ||
| 244 | CONFIG_HFS_FS=m | 326 | CONFIG_HFS_FS=m |
| 245 | CONFIG_HFSPLUS_FS=m | 327 | CONFIG_HFSPLUS_FS=m |
| 246 | CONFIG_CRAMFS=m | 328 | CONFIG_CRAMFS=m |
| 247 | CONFIG_SQUASHFS=m | 329 | CONFIG_SQUASHFS=m |
| 248 | CONFIG_MINIX_FS=y | 330 | CONFIG_SQUASHFS_LZO=y |
| 331 | CONFIG_MINIX_FS=m | ||
| 332 | CONFIG_OMFS_FS=m | ||
| 249 | CONFIG_HPFS_FS=m | 333 | CONFIG_HPFS_FS=m |
| 334 | CONFIG_QNX4FS_FS=m | ||
| 335 | CONFIG_QNX6FS_FS=m | ||
| 250 | CONFIG_SYSV_FS=m | 336 | CONFIG_SYSV_FS=m |
| 251 | CONFIG_UFS_FS=m | 337 | CONFIG_UFS_FS=m |
| 252 | CONFIG_NFS_FS=y | 338 | CONFIG_NFS_FS=y |
| 253 | CONFIG_NFS_V3=y | ||
| 254 | CONFIG_NFS_V4=y | 339 | CONFIG_NFS_V4=y |
| 340 | CONFIG_NFS_SWAP=y | ||
| 255 | CONFIG_ROOT_NFS=y | 341 | CONFIG_ROOT_NFS=y |
| 256 | CONFIG_NFSD=m | 342 | CONFIG_NFSD=m |
| 257 | CONFIG_NFSD_V3=y | 343 | CONFIG_NFSD_V3=y |
| 258 | CONFIG_SMB_FS=m | 344 | CONFIG_CIFS=m |
| 259 | CONFIG_SMB_NLS_DEFAULT=y | 345 | # CONFIG_CIFS_DEBUG is not set |
| 260 | CONFIG_CODA_FS=m | 346 | CONFIG_CODA_FS=m |
| 261 | CONFIG_NLS_CODEPAGE_437=y | 347 | CONFIG_NLS_CODEPAGE_437=y |
| 262 | CONFIG_NLS_CODEPAGE_737=m | 348 | CONFIG_NLS_CODEPAGE_737=m |
| @@ -295,10 +381,23 @@ CONFIG_NLS_ISO8859_14=m | |||
| 295 | CONFIG_NLS_ISO8859_15=m | 381 | CONFIG_NLS_ISO8859_15=m |
| 296 | CONFIG_NLS_KOI8_R=m | 382 | CONFIG_NLS_KOI8_R=m |
| 297 | CONFIG_NLS_KOI8_U=m | 383 | CONFIG_NLS_KOI8_U=m |
| 384 | CONFIG_NLS_MAC_ROMAN=m | ||
| 385 | CONFIG_NLS_MAC_CELTIC=m | ||
| 386 | CONFIG_NLS_MAC_CENTEURO=m | ||
| 387 | CONFIG_NLS_MAC_CROATIAN=m | ||
| 388 | CONFIG_NLS_MAC_CYRILLIC=m | ||
| 389 | CONFIG_NLS_MAC_GAELIC=m | ||
| 390 | CONFIG_NLS_MAC_GREEK=m | ||
| 391 | CONFIG_NLS_MAC_ICELAND=m | ||
| 392 | CONFIG_NLS_MAC_INUIT=m | ||
| 393 | CONFIG_NLS_MAC_ROMANIAN=m | ||
| 394 | CONFIG_NLS_MAC_TURKISH=m | ||
| 298 | CONFIG_DLM=m | 395 | CONFIG_DLM=m |
| 299 | CONFIG_MAGIC_SYSRQ=y | 396 | CONFIG_MAGIC_SYSRQ=y |
| 300 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 397 | CONFIG_ASYNC_RAID6_TEST=m |
| 301 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 398 | CONFIG_ENCRYPTED_KEYS=m |
| 399 | CONFIG_CRYPTO_MANAGER=y | ||
| 400 | CONFIG_CRYPTO_USER=m | ||
| 302 | CONFIG_CRYPTO_NULL=m | 401 | CONFIG_CRYPTO_NULL=m |
| 303 | CONFIG_CRYPTO_CRYPTD=m | 402 | CONFIG_CRYPTO_CRYPTD=m |
| 304 | CONFIG_CRYPTO_TEST=m | 403 | CONFIG_CRYPTO_TEST=m |
| @@ -308,19 +407,16 @@ CONFIG_CRYPTO_CTS=m | |||
| 308 | CONFIG_CRYPTO_LRW=m | 407 | CONFIG_CRYPTO_LRW=m |
| 309 | CONFIG_CRYPTO_PCBC=m | 408 | CONFIG_CRYPTO_PCBC=m |
| 310 | CONFIG_CRYPTO_XTS=m | 409 | CONFIG_CRYPTO_XTS=m |
| 311 | CONFIG_CRYPTO_HMAC=y | ||
| 312 | CONFIG_CRYPTO_XCBC=m | 410 | CONFIG_CRYPTO_XCBC=m |
| 313 | CONFIG_CRYPTO_MD4=m | 411 | CONFIG_CRYPTO_VMAC=m |
| 314 | CONFIG_CRYPTO_MICHAEL_MIC=m | 412 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 315 | CONFIG_CRYPTO_RMD128=m | 413 | CONFIG_CRYPTO_RMD128=m |
| 316 | CONFIG_CRYPTO_RMD160=m | 414 | CONFIG_CRYPTO_RMD160=m |
| 317 | CONFIG_CRYPTO_RMD256=m | 415 | CONFIG_CRYPTO_RMD256=m |
| 318 | CONFIG_CRYPTO_RMD320=m | 416 | CONFIG_CRYPTO_RMD320=m |
| 319 | CONFIG_CRYPTO_SHA256=m | ||
| 320 | CONFIG_CRYPTO_SHA512=m | 417 | CONFIG_CRYPTO_SHA512=m |
| 321 | CONFIG_CRYPTO_TGR192=m | 418 | CONFIG_CRYPTO_TGR192=m |
| 322 | CONFIG_CRYPTO_WP512=m | 419 | CONFIG_CRYPTO_WP512=m |
| 323 | CONFIG_CRYPTO_AES=m | ||
| 324 | CONFIG_CRYPTO_ANUBIS=m | 420 | CONFIG_CRYPTO_ANUBIS=m |
| 325 | CONFIG_CRYPTO_BLOWFISH=m | 421 | CONFIG_CRYPTO_BLOWFISH=m |
| 326 | CONFIG_CRYPTO_CAMELLIA=m | 422 | CONFIG_CRYPTO_CAMELLIA=m |
| @@ -336,6 +432,14 @@ CONFIG_CRYPTO_TWOFISH=m | |||
| 336 | CONFIG_CRYPTO_ZLIB=m | 432 | CONFIG_CRYPTO_ZLIB=m |
| 337 | CONFIG_CRYPTO_LZO=m | 433 | CONFIG_CRYPTO_LZO=m |
| 338 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 434 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 435 | CONFIG_CRYPTO_USER_API_HASH=m | ||
| 436 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
| 339 | # CONFIG_CRYPTO_HW is not set | 437 | # CONFIG_CRYPTO_HW is not set |
| 340 | CONFIG_CRC16=m | ||
| 341 | CONFIG_CRC_T10DIF=y | 438 | CONFIG_CRC_T10DIF=y |
| 439 | CONFIG_XZ_DEC_X86=y | ||
| 440 | CONFIG_XZ_DEC_POWERPC=y | ||
| 441 | CONFIG_XZ_DEC_IA64=y | ||
| 442 | CONFIG_XZ_DEC_ARM=y | ||
| 443 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
| 444 | CONFIG_XZ_DEC_SPARC=y | ||
| 445 | CONFIG_XZ_DEC_TEST=m | ||
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild index c7933e41f10d..09d77a862da3 100644 --- a/arch/m68k/include/asm/Kbuild +++ b/arch/m68k/include/asm/Kbuild | |||
| @@ -6,7 +6,6 @@ generic-y += device.h | |||
| 6 | generic-y += emergency-restart.h | 6 | generic-y += emergency-restart.h |
| 7 | generic-y += errno.h | 7 | generic-y += errno.h |
| 8 | generic-y += exec.h | 8 | generic-y += exec.h |
| 9 | generic-y += futex.h | ||
| 10 | generic-y += hw_irq.h | 9 | generic-y += hw_irq.h |
| 11 | generic-y += ioctl.h | 10 | generic-y += ioctl.h |
| 12 | generic-y += ipcbuf.h | 11 | generic-y += ipcbuf.h |
diff --git a/arch/m68k/include/asm/futex.h b/arch/m68k/include/asm/futex.h new file mode 100644 index 000000000000..bc868af10c96 --- /dev/null +++ b/arch/m68k/include/asm/futex.h | |||
| @@ -0,0 +1,94 @@ | |||
| 1 | #ifndef _ASM_M68K_FUTEX_H | ||
| 2 | #define _ASM_M68K_FUTEX_H | ||
| 3 | |||
| 4 | #ifdef __KERNEL__ | ||
| 5 | #if !defined(CONFIG_MMU) | ||
| 6 | #include <asm-generic/futex.h> | ||
| 7 | #else /* CONFIG_MMU */ | ||
| 8 | |||
| 9 | #include <linux/futex.h> | ||
| 10 | #include <linux/uaccess.h> | ||
| 11 | #include <asm/errno.h> | ||
| 12 | |||
| 13 | static inline int | ||
| 14 | futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, | ||
| 15 | u32 oldval, u32 newval) | ||
| 16 | { | ||
| 17 | u32 val; | ||
| 18 | |||
| 19 | if (unlikely(get_user(val, uaddr) != 0)) | ||
| 20 | return -EFAULT; | ||
| 21 | |||
| 22 | if (val == oldval && unlikely(put_user(newval, uaddr) != 0)) | ||
| 23 | return -EFAULT; | ||
| 24 | |||
| 25 | *uval = val; | ||
| 26 | |||
| 27 | return 0; | ||
| 28 | } | ||
| 29 | |||
| 30 | static inline int | ||
| 31 | futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr) | ||
| 32 | { | ||
| 33 | int op = (encoded_op >> 28) & 7; | ||
| 34 | int cmp = (encoded_op >> 24) & 15; | ||
| 35 | int oparg = (encoded_op << 8) >> 20; | ||
| 36 | int cmparg = (encoded_op << 20) >> 20; | ||
| 37 | int oldval, ret; | ||
| 38 | u32 tmp; | ||
| 39 | |||
| 40 | if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) | ||
| 41 | oparg = 1 << oparg; | ||
| 42 | |||
| 43 | pagefault_disable(); /* implies preempt_disable() */ | ||
| 44 | |||
| 45 | ret = -EFAULT; | ||
| 46 | if (unlikely(get_user(oldval, uaddr) != 0)) | ||
| 47 | goto out_pagefault_enable; | ||
| 48 | |||
| 49 | ret = 0; | ||
| 50 | tmp = oldval; | ||
| 51 | |||
| 52 | switch (op) { | ||
| 53 | case FUTEX_OP_SET: | ||
| 54 | tmp = oparg; | ||
| 55 | break; | ||
| 56 | case FUTEX_OP_ADD: | ||
| 57 | tmp += oparg; | ||
| 58 | break; | ||
| 59 | case FUTEX_OP_OR: | ||
| 60 | tmp |= oparg; | ||
| 61 | break; | ||
| 62 | case FUTEX_OP_ANDN: | ||
| 63 | tmp &= ~oparg; | ||
| 64 | break; | ||
| 65 | case FUTEX_OP_XOR: | ||
| 66 | tmp ^= oparg; | ||
| 67 | break; | ||
| 68 | default: | ||
| 69 | ret = -ENOSYS; | ||
| 70 | } | ||
| 71 | |||
| 72 | if (ret == 0 && unlikely(put_user(tmp, uaddr) != 0)) | ||
| 73 | ret = -EFAULT; | ||
| 74 | |||
| 75 | out_pagefault_enable: | ||
| 76 | pagefault_enable(); /* subsumes preempt_enable() */ | ||
| 77 | |||
| 78 | if (ret == 0) { | ||
| 79 | switch (cmp) { | ||
| 80 | case FUTEX_OP_CMP_EQ: ret = (oldval == cmparg); break; | ||
| 81 | case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break; | ||
| 82 | case FUTEX_OP_CMP_LT: ret = (oldval < cmparg); break; | ||
| 83 | case FUTEX_OP_CMP_GE: ret = (oldval >= cmparg); break; | ||
| 84 | case FUTEX_OP_CMP_LE: ret = (oldval <= cmparg); break; | ||
| 85 | case FUTEX_OP_CMP_GT: ret = (oldval > cmparg); break; | ||
| 86 | default: ret = -ENOSYS; | ||
| 87 | } | ||
| 88 | } | ||
| 89 | return ret; | ||
| 90 | } | ||
| 91 | |||
| 92 | #endif /* CONFIG_MMU */ | ||
| 93 | #endif /* __KERNEL__ */ | ||
| 94 | #endif /* _ASM_M68K_FUTEX_H */ | ||
diff --git a/arch/microblaze/include/asm/futex.h b/arch/microblaze/include/asm/futex.h index ff8cde159d9a..01848f056f43 100644 --- a/arch/microblaze/include/asm/futex.h +++ b/arch/microblaze/include/asm/futex.h | |||
| @@ -105,7 +105,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, | |||
| 105 | 105 | ||
| 106 | __asm__ __volatile__ ("1: lwx %1, %3, r0; \ | 106 | __asm__ __volatile__ ("1: lwx %1, %3, r0; \ |
| 107 | cmp %2, %1, %4; \ | 107 | cmp %2, %1, %4; \ |
| 108 | beqi %2, 3f; \ | 108 | bnei %2, 3f; \ |
| 109 | 2: swx %5, %3, r0; \ | 109 | 2: swx %5, %3, r0; \ |
| 110 | addic %2, r0, 0; \ | 110 | addic %2, r0, 0; \ |
| 111 | bnei %2, 1b; \ | 111 | bnei %2, 1b; \ |
diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h index 8cb8a8566ede..2565cb94f32f 100644 --- a/arch/microblaze/include/asm/io.h +++ b/arch/microblaze/include/asm/io.h | |||
| @@ -123,11 +123,11 @@ static inline void writel(unsigned int v, volatile void __iomem *addr) | |||
| 123 | * inb_p/inw_p/... | 123 | * inb_p/inw_p/... |
| 124 | * The macros don't do byte-swapping. | 124 | * The macros don't do byte-swapping. |
| 125 | */ | 125 | */ |
| 126 | #define inb(port) readb((u8 *)((port))) | 126 | #define inb(port) readb((u8 *)((unsigned long)(port))) |
| 127 | #define outb(val, port) writeb((val), (u8 *)((unsigned long)(port))) | 127 | #define outb(val, port) writeb((val), (u8 *)((unsigned long)(port))) |
| 128 | #define inw(port) readw((u16 *)((port))) | 128 | #define inw(port) readw((u16 *)((unsigned long)(port))) |
| 129 | #define outw(val, port) writew((val), (u16 *)((unsigned long)(port))) | 129 | #define outw(val, port) writew((val), (u16 *)((unsigned long)(port))) |
| 130 | #define inl(port) readl((u32 *)((port))) | 130 | #define inl(port) readl((u32 *)((unsigned long)(port))) |
| 131 | #define outl(val, port) writel((val), (u32 *)((unsigned long)(port))) | 131 | #define outl(val, port) writel((val), (u32 *)((unsigned long)(port))) |
| 132 | 132 | ||
| 133 | #define inb_p(port) inb((port)) | 133 | #define inb_p(port) inb((port)) |
diff --git a/arch/microblaze/kernel/cpu/cache.c b/arch/microblaze/kernel/cpu/cache.c index 4254514b4c8c..a6e44410672d 100644 --- a/arch/microblaze/kernel/cpu/cache.c +++ b/arch/microblaze/kernel/cpu/cache.c | |||
| @@ -140,7 +140,7 @@ do { \ | |||
| 140 | /* It is used only first parameter for OP - for wic, wdc */ | 140 | /* It is used only first parameter for OP - for wic, wdc */ |
| 141 | #define CACHE_RANGE_LOOP_1(start, end, line_length, op) \ | 141 | #define CACHE_RANGE_LOOP_1(start, end, line_length, op) \ |
| 142 | do { \ | 142 | do { \ |
| 143 | int volatile temp; \ | 143 | int volatile temp = 0; \ |
| 144 | int align = ~(line_length - 1); \ | 144 | int align = ~(line_length - 1); \ |
| 145 | end = ((end & align) == end) ? end - line_length : end & align; \ | 145 | end = ((end & align) == end) ? end - line_length : end & align; \ |
| 146 | WARN_ON(end - start < 0); \ | 146 | WARN_ON(end - start < 0); \ |
diff --git a/arch/mn10300/include/asm/pci.h b/arch/mn10300/include/asm/pci.h index 8137c25c4e15..6f31cc0f1a87 100644 --- a/arch/mn10300/include/asm/pci.h +++ b/arch/mn10300/include/asm/pci.h | |||
| @@ -103,4 +103,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) | |||
| 103 | return channel ? 15 : 14; | 103 | return channel ? 15 : 14; |
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | #include <asm-generic/pci_iomap.h> | ||
| 107 | |||
| 106 | #endif /* _ASM_PCI_H */ | 108 | #endif /* _ASM_PCI_H */ |
diff --git a/arch/mn10300/kernel/entry.S b/arch/mn10300/kernel/entry.S index 68fcab8f8f6f..222152a3f751 100644 --- a/arch/mn10300/kernel/entry.S +++ b/arch/mn10300/kernel/entry.S | |||
| @@ -60,6 +60,7 @@ ENTRY(ret_from_kernel_thread) | |||
| 60 | mov (REG_D0,fp),d0 | 60 | mov (REG_D0,fp),d0 |
| 61 | mov (REG_A0,fp),a0 | 61 | mov (REG_A0,fp),a0 |
| 62 | calls (a0) | 62 | calls (a0) |
| 63 | GET_THREAD_INFO a2 # A2 must be set on return from sys_exit() | ||
| 63 | clr d0 | 64 | clr d0 |
| 64 | mov d0,(REG_D0,fp) | 65 | mov d0,(REG_D0,fp) |
| 65 | jmp syscall_exit | 66 | jmp syscall_exit |
| @@ -107,10 +108,10 @@ syscall_exit_work: | |||
| 107 | and EPSW_nSL,d0 | 108 | and EPSW_nSL,d0 |
| 108 | beq resume_kernel # returning to supervisor mode | 109 | beq resume_kernel # returning to supervisor mode |
| 109 | 110 | ||
| 110 | btst _TIF_SYSCALL_TRACE,d2 | ||
| 111 | beq work_pending | ||
| 112 | LOCAL_IRQ_ENABLE # could let syscall_trace_exit() call | 111 | LOCAL_IRQ_ENABLE # could let syscall_trace_exit() call |
| 113 | # schedule() instead | 112 | # schedule() instead |
| 113 | btst _TIF_SYSCALL_TRACE,d2 | ||
| 114 | beq work_pending | ||
| 114 | mov fp,d0 | 115 | mov fp,d0 |
| 115 | call syscall_trace_exit[],0 # do_syscall_trace(regs) | 116 | call syscall_trace_exit[],0 # do_syscall_trace(regs) |
| 116 | jmp resume_userspace | 117 | jmp resume_userspace |
| @@ -123,6 +124,7 @@ work_pending: | |||
| 123 | work_resched: | 124 | work_resched: |
| 124 | call schedule[],0 | 125 | call schedule[],0 |
| 125 | 126 | ||
| 127 | resume_userspace: | ||
| 126 | # make sure we don't miss an interrupt setting need_resched or | 128 | # make sure we don't miss an interrupt setting need_resched or |
| 127 | # sigpending between sampling and the rti | 129 | # sigpending between sampling and the rti |
| 128 | LOCAL_IRQ_DISABLE | 130 | LOCAL_IRQ_DISABLE |
| @@ -131,6 +133,8 @@ work_resched: | |||
| 131 | mov (TI_flags,a2),d2 | 133 | mov (TI_flags,a2),d2 |
| 132 | btst _TIF_WORK_MASK,d2 | 134 | btst _TIF_WORK_MASK,d2 |
| 133 | beq restore_all | 135 | beq restore_all |
| 136 | |||
| 137 | LOCAL_IRQ_ENABLE | ||
| 134 | btst _TIF_NEED_RESCHED,d2 | 138 | btst _TIF_NEED_RESCHED,d2 |
| 135 | bne work_resched | 139 | bne work_resched |
| 136 | 140 | ||
| @@ -169,17 +173,6 @@ ret_from_intr: | |||
| 169 | and EPSW_nSL,d0 | 173 | and EPSW_nSL,d0 |
| 170 | beq resume_kernel # returning to supervisor mode | 174 | beq resume_kernel # returning to supervisor mode |
| 171 | 175 | ||
| 172 | ENTRY(resume_userspace) | ||
| 173 | # make sure we don't miss an interrupt setting need_resched or | ||
| 174 | # sigpending between sampling and the rti | ||
| 175 | LOCAL_IRQ_DISABLE | ||
| 176 | |||
| 177 | # is there any work to be done on int/exception return? | ||
| 178 | mov (TI_flags,a2),d2 | ||
| 179 | btst _TIF_WORK_MASK,d2 | ||
| 180 | bne work_pending | ||
| 181 | jmp restore_all | ||
| 182 | |||
| 183 | #ifdef CONFIG_PREEMPT | 176 | #ifdef CONFIG_PREEMPT |
| 184 | ENTRY(resume_kernel) | 177 | ENTRY(resume_kernel) |
| 185 | LOCAL_IRQ_DISABLE | 178 | LOCAL_IRQ_DISABLE |
diff --git a/arch/mn10300/unit-asb2305/pci.c b/arch/mn10300/unit-asb2305/pci.c index 1adcf024bb9a..e37fac0461f3 100644 --- a/arch/mn10300/unit-asb2305/pci.c +++ b/arch/mn10300/unit-asb2305/pci.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
| 20 | #include <linux/irq.h> | 20 | #include <linux/irq.h> |
| 21 | #include <asm/io.h> | 21 | #include <asm/io.h> |
| 22 | #include <asm/irq.h> | ||
| 22 | #include "pci-asb2305.h" | 23 | #include "pci-asb2305.h" |
| 23 | 24 | ||
| 24 | unsigned int pci_probe = 1; | 25 | unsigned int pci_probe = 1; |
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile index 197690068f88..96ec3982be8d 100644 --- a/arch/parisc/Makefile +++ b/arch/parisc/Makefile | |||
| @@ -66,7 +66,7 @@ KBUILD_CFLAGS_KERNEL += -mlong-calls | |||
| 66 | endif | 66 | endif |
| 67 | 67 | ||
| 68 | # select which processor to optimise for | 68 | # select which processor to optimise for |
| 69 | cflags-$(CONFIG_PA7100) += -march=1.1 -mschedule=7100 | 69 | cflags-$(CONFIG_PA7000) += -march=1.1 -mschedule=7100 |
| 70 | cflags-$(CONFIG_PA7200) += -march=1.1 -mschedule=7200 | 70 | cflags-$(CONFIG_PA7200) += -march=1.1 -mschedule=7200 |
| 71 | cflags-$(CONFIG_PA7100LC) += -march=1.1 -mschedule=7100LC | 71 | cflags-$(CONFIG_PA7100LC) += -march=1.1 -mschedule=7100LC |
| 72 | cflags-$(CONFIG_PA7300LC) += -march=1.1 -mschedule=7300 | 72 | cflags-$(CONFIG_PA7300LC) += -march=1.1 -mschedule=7300 |
diff --git a/arch/parisc/include/asm/mmzone.h b/arch/parisc/include/asm/mmzone.h index 0e625ab9aaec..cc50d33b7b88 100644 --- a/arch/parisc/include/asm/mmzone.h +++ b/arch/parisc/include/asm/mmzone.h | |||
| @@ -39,17 +39,14 @@ extern unsigned char pfnnid_map[PFNNID_MAP_MAX]; | |||
| 39 | static inline int pfn_to_nid(unsigned long pfn) | 39 | static inline int pfn_to_nid(unsigned long pfn) |
| 40 | { | 40 | { |
| 41 | unsigned int i; | 41 | unsigned int i; |
| 42 | unsigned char r; | ||
| 43 | 42 | ||
| 44 | if (unlikely(pfn_is_io(pfn))) | 43 | if (unlikely(pfn_is_io(pfn))) |
| 45 | return 0; | 44 | return 0; |
| 46 | 45 | ||
| 47 | i = pfn >> PFNNID_SHIFT; | 46 | i = pfn >> PFNNID_SHIFT; |
| 48 | BUG_ON(i >= ARRAY_SIZE(pfnnid_map)); | 47 | BUG_ON(i >= ARRAY_SIZE(pfnnid_map)); |
| 49 | r = pfnnid_map[i]; | ||
| 50 | BUG_ON(r == 0xff); | ||
| 51 | 48 | ||
| 52 | return (int)r; | 49 | return (int)pfnnid_map[i]; |
| 53 | } | 50 | } |
| 54 | 51 | ||
| 55 | static inline int pfn_valid(int pfn) | 52 | static inline int pfn_valid(int pfn) |
diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c index 5709c5e59be8..14285caec71a 100644 --- a/arch/parisc/kernel/drivers.c +++ b/arch/parisc/kernel/drivers.c | |||
| @@ -394,7 +394,7 @@ EXPORT_SYMBOL(print_pci_hwpath); | |||
| 394 | static void setup_bus_id(struct parisc_device *padev) | 394 | static void setup_bus_id(struct parisc_device *padev) |
| 395 | { | 395 | { |
| 396 | struct hardware_path path; | 396 | struct hardware_path path; |
| 397 | char name[20]; | 397 | char name[28]; |
| 398 | char *output = name; | 398 | char *output = name; |
| 399 | int i; | 399 | int i; |
| 400 | 400 | ||
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c index 76b63e726a53..1e95b2000ce8 100644 --- a/arch/parisc/kernel/setup.c +++ b/arch/parisc/kernel/setup.c | |||
| @@ -69,7 +69,8 @@ void __init setup_cmdline(char **cmdline_p) | |||
| 69 | /* called from hpux boot loader */ | 69 | /* called from hpux boot loader */ |
| 70 | boot_command_line[0] = '\0'; | 70 | boot_command_line[0] = '\0'; |
| 71 | } else { | 71 | } else { |
| 72 | strcpy(boot_command_line, (char *)__va(boot_args[1])); | 72 | strlcpy(boot_command_line, (char *)__va(boot_args[1]), |
| 73 | COMMAND_LINE_SIZE); | ||
| 73 | 74 | ||
| 74 | #ifdef CONFIG_BLK_DEV_INITRD | 75 | #ifdef CONFIG_BLK_DEV_INITRD |
| 75 | if (boot_args[2] != 0) /* did palo pass us a ramdisk? */ | 76 | if (boot_args[2] != 0) /* did palo pass us a ramdisk? */ |
diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h index cf4df8e2139a..0c7f2bfcf134 100644 --- a/arch/powerpc/include/asm/hvcall.h +++ b/arch/powerpc/include/asm/hvcall.h | |||
| @@ -264,6 +264,7 @@ | |||
| 264 | #define H_GET_MPP 0x2D4 | 264 | #define H_GET_MPP 0x2D4 |
| 265 | #define H_HOME_NODE_ASSOCIATIVITY 0x2EC | 265 | #define H_HOME_NODE_ASSOCIATIVITY 0x2EC |
| 266 | #define H_BEST_ENERGY 0x2F4 | 266 | #define H_BEST_ENERGY 0x2F4 |
| 267 | #define H_XIRR_X 0x2FC | ||
| 267 | #define H_RANDOM 0x300 | 268 | #define H_RANDOM 0x300 |
| 268 | #define H_COP 0x304 | 269 | #define H_COP 0x304 |
| 269 | #define H_GET_MPP_X 0x314 | 270 | #define H_GET_MPP_X 0x314 |
diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h index cea8496091ff..2f1b6c5f8174 100644 --- a/arch/powerpc/include/asm/ppc_asm.h +++ b/arch/powerpc/include/asm/ppc_asm.h | |||
| @@ -523,6 +523,17 @@ END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,946) | |||
| 523 | #define PPC440EP_ERR42 | 523 | #define PPC440EP_ERR42 |
| 524 | #endif | 524 | #endif |
| 525 | 525 | ||
| 526 | /* The following stops all load and store data streams associated with stream | ||
| 527 | * ID (ie. streams created explicitly). The embedded and server mnemonics for | ||
| 528 | * dcbt are different so we use machine "power4" here explicitly. | ||
| 529 | */ | ||
| 530 | #define DCBT_STOP_ALL_STREAM_IDS(scratch) \ | ||
| 531 | .machine push ; \ | ||
| 532 | .machine "power4" ; \ | ||
| 533 | lis scratch,0x60000000@h; \ | ||
| 534 | dcbt r0,scratch,0b01010; \ | ||
| 535 | .machine pop | ||
| 536 | |||
| 526 | /* | 537 | /* |
| 527 | * toreal/fromreal/tophys/tovirt macros. 32-bit BookE makes them | 538 | * toreal/fromreal/tophys/tovirt macros. 32-bit BookE makes them |
| 528 | * keep the address intact to be compatible with code shared with | 539 | * keep the address intact to be compatible with code shared with |
diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index 594db6bc093c..14a658363698 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h | |||
| @@ -409,21 +409,16 @@ static inline void prefetchw(const void *x) | |||
| 409 | #endif | 409 | #endif |
| 410 | 410 | ||
| 411 | #ifdef CONFIG_PPC64 | 411 | #ifdef CONFIG_PPC64 |
| 412 | static inline unsigned long get_clean_sp(struct pt_regs *regs, int is_32) | 412 | static inline unsigned long get_clean_sp(unsigned long sp, int is_32) |
| 413 | { | 413 | { |
| 414 | unsigned long sp; | ||
| 415 | |||
| 416 | if (is_32) | 414 | if (is_32) |
| 417 | sp = regs->gpr[1] & 0x0ffffffffUL; | 415 | return sp & 0x0ffffffffUL; |
| 418 | else | ||
| 419 | sp = regs->gpr[1]; | ||
| 420 | |||
| 421 | return sp; | 416 | return sp; |
| 422 | } | 417 | } |
| 423 | #else | 418 | #else |
| 424 | static inline unsigned long get_clean_sp(struct pt_regs *regs, int is_32) | 419 | static inline unsigned long get_clean_sp(unsigned long sp, int is_32) |
| 425 | { | 420 | { |
| 426 | return regs->gpr[1]; | 421 | return sp; |
| 427 | } | 422 | } |
| 428 | #endif | 423 | #endif |
| 429 | 424 | ||
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h index a6136515c7f2..4a9e408644fe 100644 --- a/arch/powerpc/include/asm/reg.h +++ b/arch/powerpc/include/asm/reg.h | |||
| @@ -111,17 +111,6 @@ | |||
| 111 | #define MSR_TM_TRANSACTIONAL(x) (((x) & MSR_TS_MASK) == MSR_TS_T) | 111 | #define MSR_TM_TRANSACTIONAL(x) (((x) & MSR_TS_MASK) == MSR_TS_T) |
| 112 | #define MSR_TM_SUSPENDED(x) (((x) & MSR_TS_MASK) == MSR_TS_S) | 112 | #define MSR_TM_SUSPENDED(x) (((x) & MSR_TS_MASK) == MSR_TS_S) |
| 113 | 113 | ||
| 114 | /* Reason codes describing kernel causes for transaction aborts. By | ||
| 115 | convention, bit0 is copied to TEXASR[56] (IBM bit 7) which is set if | ||
| 116 | the failure is persistent. | ||
| 117 | */ | ||
| 118 | #define TM_CAUSE_RESCHED 0xfe | ||
| 119 | #define TM_CAUSE_TLBI 0xfc | ||
| 120 | #define TM_CAUSE_FAC_UNAV 0xfa | ||
| 121 | #define TM_CAUSE_SYSCALL 0xf9 /* Persistent */ | ||
| 122 | #define TM_CAUSE_MISC 0xf6 | ||
| 123 | #define TM_CAUSE_SIGNAL 0xf4 | ||
| 124 | |||
| 125 | #if defined(CONFIG_PPC_BOOK3S_64) | 114 | #if defined(CONFIG_PPC_BOOK3S_64) |
| 126 | #define MSR_64BIT MSR_SF | 115 | #define MSR_64BIT MSR_SF |
| 127 | 116 | ||
diff --git a/arch/powerpc/include/asm/signal.h b/arch/powerpc/include/asm/signal.h index fbe66c463891..9322c28aebd2 100644 --- a/arch/powerpc/include/asm/signal.h +++ b/arch/powerpc/include/asm/signal.h | |||
| @@ -3,5 +3,8 @@ | |||
| 3 | 3 | ||
| 4 | #define __ARCH_HAS_SA_RESTORER | 4 | #define __ARCH_HAS_SA_RESTORER |
| 5 | #include <uapi/asm/signal.h> | 5 | #include <uapi/asm/signal.h> |
| 6 | #include <uapi/asm/ptrace.h> | ||
| 7 | |||
| 8 | extern unsigned long get_tm_stackpointer(struct pt_regs *regs); | ||
| 6 | 9 | ||
| 7 | #endif /* _ASM_POWERPC_SIGNAL_H */ | 10 | #endif /* _ASM_POWERPC_SIGNAL_H */ |
diff --git a/arch/powerpc/include/asm/tm.h b/arch/powerpc/include/asm/tm.h index 4b4449abf3f8..9dfbc34bdbf5 100644 --- a/arch/powerpc/include/asm/tm.h +++ b/arch/powerpc/include/asm/tm.h | |||
| @@ -5,6 +5,8 @@ | |||
| 5 | * Copyright 2012 Matt Evans & Michael Neuling, IBM Corporation. | 5 | * Copyright 2012 Matt Evans & Michael Neuling, IBM Corporation. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <uapi/asm/tm.h> | ||
| 9 | |||
| 8 | #ifdef CONFIG_PPC_TRANSACTIONAL_MEM | 10 | #ifdef CONFIG_PPC_TRANSACTIONAL_MEM |
| 9 | extern void do_load_up_transact_fpu(struct thread_struct *thread); | 11 | extern void do_load_up_transact_fpu(struct thread_struct *thread); |
| 10 | extern void do_load_up_transact_altivec(struct thread_struct *thread); | 12 | extern void do_load_up_transact_altivec(struct thread_struct *thread); |
diff --git a/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index f7bca6370745..5182c8622b54 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild | |||
| @@ -40,6 +40,7 @@ header-y += statfs.h | |||
| 40 | header-y += swab.h | 40 | header-y += swab.h |
| 41 | header-y += termbits.h | 41 | header-y += termbits.h |
| 42 | header-y += termios.h | 42 | header-y += termios.h |
| 43 | header-y += tm.h | ||
| 43 | header-y += types.h | 44 | header-y += types.h |
| 44 | header-y += ucontext.h | 45 | header-y += ucontext.h |
| 45 | header-y += unistd.h | 46 | header-y += unistd.h |
diff --git a/arch/powerpc/include/uapi/asm/tm.h b/arch/powerpc/include/uapi/asm/tm.h new file mode 100644 index 000000000000..85059a00f560 --- /dev/null +++ b/arch/powerpc/include/uapi/asm/tm.h | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | #ifndef _ASM_POWERPC_TM_H | ||
| 2 | #define _ASM_POWERPC_TM_H | ||
| 3 | |||
| 4 | /* Reason codes describing kernel causes for transaction aborts. By | ||
| 5 | * convention, bit0 is copied to TEXASR[56] (IBM bit 7) which is set if | ||
| 6 | * the failure is persistent. PAPR saves 0xff-0xe0 for the hypervisor. | ||
| 7 | */ | ||
| 8 | #define TM_CAUSE_PERSISTENT 0x01 | ||
| 9 | #define TM_CAUSE_RESCHED 0xde | ||
| 10 | #define TM_CAUSE_TLBI 0xdc | ||
| 11 | #define TM_CAUSE_FAC_UNAV 0xda | ||
| 12 | #define TM_CAUSE_SYSCALL 0xd8 /* future use */ | ||
| 13 | #define TM_CAUSE_MISC 0xd6 /* future use */ | ||
| 14 | #define TM_CAUSE_SIGNAL 0xd4 | ||
| 15 | #define TM_CAUSE_ALIGNMENT 0xd2 | ||
| 16 | #define TM_CAUSE_EMULATE 0xd0 | ||
| 17 | |||
| 18 | #endif | ||
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index c60bbec25c1f..1f0937d7d4b5 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
| @@ -453,7 +453,7 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
| 453 | .icache_bsize = 128, | 453 | .icache_bsize = 128, |
| 454 | .dcache_bsize = 128, | 454 | .dcache_bsize = 128, |
| 455 | .oprofile_type = PPC_OPROFILE_POWER4, | 455 | .oprofile_type = PPC_OPROFILE_POWER4, |
| 456 | .oprofile_cpu_type = "ppc64/ibm-compat-v1", | 456 | .oprofile_cpu_type = 0, |
| 457 | .cpu_setup = __setup_cpu_power8, | 457 | .cpu_setup = __setup_cpu_power8, |
| 458 | .cpu_restore = __restore_cpu_power8, | 458 | .cpu_restore = __restore_cpu_power8, |
| 459 | .platform = "power8", | 459 | .platform = "power8", |
| @@ -482,7 +482,7 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
| 482 | .cpu_name = "POWER7+ (raw)", | 482 | .cpu_name = "POWER7+ (raw)", |
| 483 | .cpu_features = CPU_FTRS_POWER7, | 483 | .cpu_features = CPU_FTRS_POWER7, |
| 484 | .cpu_user_features = COMMON_USER_POWER7, | 484 | .cpu_user_features = COMMON_USER_POWER7, |
| 485 | .cpu_user_features = COMMON_USER2_POWER7, | 485 | .cpu_user_features2 = COMMON_USER2_POWER7, |
| 486 | .mmu_features = MMU_FTRS_POWER7, | 486 | .mmu_features = MMU_FTRS_POWER7, |
| 487 | .icache_bsize = 128, | 487 | .icache_bsize = 128, |
| 488 | .dcache_bsize = 128, | 488 | .dcache_bsize = 128, |
| @@ -506,7 +506,7 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
| 506 | .dcache_bsize = 128, | 506 | .dcache_bsize = 128, |
| 507 | .num_pmcs = 6, | 507 | .num_pmcs = 6, |
| 508 | .pmc_type = PPC_PMC_IBM, | 508 | .pmc_type = PPC_PMC_IBM, |
| 509 | .oprofile_cpu_type = "ppc64/power8", | 509 | .oprofile_cpu_type = 0, |
| 510 | .oprofile_type = PPC_OPROFILE_POWER4, | 510 | .oprofile_type = PPC_OPROFILE_POWER4, |
| 511 | .cpu_setup = __setup_cpu_power8, | 511 | .cpu_setup = __setup_cpu_power8, |
| 512 | .cpu_restore = __restore_cpu_power8, | 512 | .cpu_restore = __restore_cpu_power8, |
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index d22e73e4618b..22b45a4955cd 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S | |||
| @@ -849,7 +849,7 @@ resume_kernel: | |||
| 849 | /* check current_thread_info, _TIF_EMULATE_STACK_STORE */ | 849 | /* check current_thread_info, _TIF_EMULATE_STACK_STORE */ |
| 850 | CURRENT_THREAD_INFO(r9, r1) | 850 | CURRENT_THREAD_INFO(r9, r1) |
| 851 | lwz r8,TI_FLAGS(r9) | 851 | lwz r8,TI_FLAGS(r9) |
| 852 | andis. r8,r8,_TIF_EMULATE_STACK_STORE@h | 852 | andis. r0,r8,_TIF_EMULATE_STACK_STORE@h |
| 853 | beq+ 1f | 853 | beq+ 1f |
| 854 | 854 | ||
| 855 | addi r8,r1,INT_FRAME_SIZE /* Get the kprobed function entry */ | 855 | addi r8,r1,INT_FRAME_SIZE /* Get the kprobed function entry */ |
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 0e9095e47b5b..246b11c4fe7e 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S | |||
| @@ -501,6 +501,13 @@ BEGIN_FTR_SECTION | |||
| 501 | ldarx r6,0,r1 | 501 | ldarx r6,0,r1 |
| 502 | END_FTR_SECTION_IFSET(CPU_FTR_STCX_CHECKS_ADDRESS) | 502 | END_FTR_SECTION_IFSET(CPU_FTR_STCX_CHECKS_ADDRESS) |
| 503 | 503 | ||
| 504 | #ifdef CONFIG_PPC_BOOK3S | ||
| 505 | /* Cancel all explict user streams as they will have no use after context | ||
| 506 | * switch and will stop the HW from creating streams itself | ||
| 507 | */ | ||
| 508 | DCBT_STOP_ALL_STREAM_IDS(r6) | ||
| 509 | #endif | ||
| 510 | |||
| 504 | addi r6,r4,-THREAD /* Convert THREAD to 'current' */ | 511 | addi r6,r4,-THREAD /* Convert THREAD to 'current' */ |
| 505 | std r6,PACACURRENT(r13) /* Set new 'current' */ | 512 | std r6,PACACURRENT(r13) /* Set new 'current' */ |
| 506 | 513 | ||
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index e9acf50dd5b2..7f2273cc3c7d 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c | |||
| @@ -657,15 +657,6 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar, | |||
| 657 | * ranges. However, some machines (thanks Apple !) tend to split their | 657 | * ranges. However, some machines (thanks Apple !) tend to split their |
| 658 | * space into lots of small contiguous ranges. So we have to coalesce. | 658 | * space into lots of small contiguous ranges. So we have to coalesce. |
| 659 | * | 659 | * |
| 660 | * - We can only cope with all memory ranges having the same offset | ||
| 661 | * between CPU addresses and PCI addresses. Unfortunately, some bridges | ||
| 662 | * are setup for a large 1:1 mapping along with a small "window" which | ||
| 663 | * maps PCI address 0 to some arbitrary high address of the CPU space in | ||
| 664 | * order to give access to the ISA memory hole. | ||
| 665 | * The way out of here that I've chosen for now is to always set the | ||
| 666 | * offset based on the first resource found, then override it if we | ||
| 667 | * have a different offset and the previous was set by an ISA hole. | ||
| 668 | * | ||
| 669 | * - Some busses have IO space not starting at 0, which causes trouble with | 660 | * - Some busses have IO space not starting at 0, which causes trouble with |
| 670 | * the way we do our IO resource renumbering. The code somewhat deals with | 661 | * the way we do our IO resource renumbering. The code somewhat deals with |
| 671 | * it for 64 bits but I would expect problems on 32 bits. | 662 | * it for 64 bits but I would expect problems on 32 bits. |
| @@ -680,10 +671,9 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose, | |||
| 680 | int rlen; | 671 | int rlen; |
| 681 | int pna = of_n_addr_cells(dev); | 672 | int pna = of_n_addr_cells(dev); |
| 682 | int np = pna + 5; | 673 | int np = pna + 5; |
| 683 | int memno = 0, isa_hole = -1; | 674 | int memno = 0; |
| 684 | u32 pci_space; | 675 | u32 pci_space; |
| 685 | unsigned long long pci_addr, cpu_addr, pci_next, cpu_next, size; | 676 | unsigned long long pci_addr, cpu_addr, pci_next, cpu_next, size; |
| 686 | unsigned long long isa_mb = 0; | ||
| 687 | struct resource *res; | 677 | struct resource *res; |
| 688 | 678 | ||
| 689 | printk(KERN_INFO "PCI host bridge %s %s ranges:\n", | 679 | printk(KERN_INFO "PCI host bridge %s %s ranges:\n", |
| @@ -777,8 +767,6 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose, | |||
| 777 | } | 767 | } |
| 778 | /* Handles ISA memory hole space here */ | 768 | /* Handles ISA memory hole space here */ |
| 779 | if (pci_addr == 0) { | 769 | if (pci_addr == 0) { |
| 780 | isa_mb = cpu_addr; | ||
| 781 | isa_hole = memno; | ||
| 782 | if (primary || isa_mem_base == 0) | 770 | if (primary || isa_mem_base == 0) |
| 783 | isa_mem_base = cpu_addr; | 771 | isa_mem_base = cpu_addr; |
| 784 | hose->isa_mem_phys = cpu_addr; | 772 | hose->isa_mem_phys = cpu_addr; |
diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c index 577a8aa69c6e..457e97aa2945 100644 --- a/arch/powerpc/kernel/signal.c +++ b/arch/powerpc/kernel/signal.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <asm/uaccess.h> | 18 | #include <asm/uaccess.h> |
| 19 | #include <asm/unistd.h> | 19 | #include <asm/unistd.h> |
| 20 | #include <asm/debug.h> | 20 | #include <asm/debug.h> |
| 21 | #include <asm/tm.h> | ||
| 21 | 22 | ||
| 22 | #include "signal.h" | 23 | #include "signal.h" |
| 23 | 24 | ||
| @@ -30,13 +31,13 @@ int show_unhandled_signals = 1; | |||
| 30 | /* | 31 | /* |
| 31 | * Allocate space for the signal frame | 32 | * Allocate space for the signal frame |
| 32 | */ | 33 | */ |
| 33 | void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, | 34 | void __user * get_sigframe(struct k_sigaction *ka, unsigned long sp, |
| 34 | size_t frame_size, int is_32) | 35 | size_t frame_size, int is_32) |
| 35 | { | 36 | { |
| 36 | unsigned long oldsp, newsp; | 37 | unsigned long oldsp, newsp; |
| 37 | 38 | ||
| 38 | /* Default to using normal stack */ | 39 | /* Default to using normal stack */ |
| 39 | oldsp = get_clean_sp(regs, is_32); | 40 | oldsp = get_clean_sp(sp, is_32); |
| 40 | 41 | ||
| 41 | /* Check for alt stack */ | 42 | /* Check for alt stack */ |
| 42 | if ((ka->sa.sa_flags & SA_ONSTACK) && | 43 | if ((ka->sa.sa_flags & SA_ONSTACK) && |
| @@ -175,3 +176,38 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags) | |||
| 175 | 176 | ||
| 176 | user_enter(); | 177 | user_enter(); |
| 177 | } | 178 | } |
| 179 | |||
| 180 | unsigned long get_tm_stackpointer(struct pt_regs *regs) | ||
| 181 | { | ||
| 182 | /* When in an active transaction that takes a signal, we need to be | ||
| 183 | * careful with the stack. It's possible that the stack has moved back | ||
| 184 | * up after the tbegin. The obvious case here is when the tbegin is | ||
| 185 | * called inside a function that returns before a tend. In this case, | ||
| 186 | * the stack is part of the checkpointed transactional memory state. | ||
| 187 | * If we write over this non transactionally or in suspend, we are in | ||
| 188 | * trouble because if we get a tm abort, the program counter and stack | ||
| 189 | * pointer will be back at the tbegin but our in memory stack won't be | ||
| 190 | * valid anymore. | ||
| 191 | * | ||
| 192 | * To avoid this, when taking a signal in an active transaction, we | ||
| 193 | * need to use the stack pointer from the checkpointed state, rather | ||
| 194 | * than the speculated state. This ensures that the signal context | ||
| 195 | * (written tm suspended) will be written below the stack required for | ||
| 196 | * the rollback. The transaction is aborted becuase of the treclaim, | ||
| 197 | * so any memory written between the tbegin and the signal will be | ||
| 198 | * rolled back anyway. | ||
| 199 | * | ||
| 200 | * For signals taken in non-TM or suspended mode, we use the | ||
| 201 | * normal/non-checkpointed stack pointer. | ||
| 202 | */ | ||
| 203 | |||
| 204 | #ifdef CONFIG_PPC_TRANSACTIONAL_MEM | ||
| 205 | if (MSR_TM_ACTIVE(regs->msr)) { | ||
| 206 | tm_enable(); | ||
| 207 | tm_reclaim(¤t->thread, regs->msr, TM_CAUSE_SIGNAL); | ||
| 208 | if (MSR_TM_TRANSACTIONAL(regs->msr)) | ||
| 209 | return current->thread.ckpt_regs.gpr[1]; | ||
| 210 | } | ||
| 211 | #endif | ||
| 212 | return regs->gpr[1]; | ||
| 213 | } | ||
diff --git a/arch/powerpc/kernel/signal.h b/arch/powerpc/kernel/signal.h index ec84c901ceab..c69b9aeb9f23 100644 --- a/arch/powerpc/kernel/signal.h +++ b/arch/powerpc/kernel/signal.h | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | extern void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags); | 13 | extern void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags); |
| 14 | 14 | ||
| 15 | extern void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, | 15 | extern void __user * get_sigframe(struct k_sigaction *ka, unsigned long sp, |
| 16 | size_t frame_size, int is_32); | 16 | size_t frame_size, int is_32); |
| 17 | 17 | ||
| 18 | extern int handle_signal32(unsigned long sig, struct k_sigaction *ka, | 18 | extern int handle_signal32(unsigned long sig, struct k_sigaction *ka, |
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c index 95068bf569ad..201385c3a1ae 100644 --- a/arch/powerpc/kernel/signal_32.c +++ b/arch/powerpc/kernel/signal_32.c | |||
| @@ -503,12 +503,6 @@ static int save_tm_user_regs(struct pt_regs *regs, | |||
| 503 | { | 503 | { |
| 504 | unsigned long msr = regs->msr; | 504 | unsigned long msr = regs->msr; |
| 505 | 505 | ||
| 506 | /* tm_reclaim rolls back all reg states, updating thread.ckpt_regs, | ||
| 507 | * thread.transact_fpr[], thread.transact_vr[], etc. | ||
| 508 | */ | ||
| 509 | tm_enable(); | ||
| 510 | tm_reclaim(¤t->thread, msr, TM_CAUSE_SIGNAL); | ||
| 511 | |||
| 512 | /* Make sure floating point registers are stored in regs */ | 506 | /* Make sure floating point registers are stored in regs */ |
| 513 | flush_fp_to_thread(current); | 507 | flush_fp_to_thread(current); |
| 514 | 508 | ||
| @@ -965,7 +959,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka, | |||
| 965 | 959 | ||
| 966 | /* Set up Signal Frame */ | 960 | /* Set up Signal Frame */ |
| 967 | /* Put a Real Time Context onto stack */ | 961 | /* Put a Real Time Context onto stack */ |
| 968 | rt_sf = get_sigframe(ka, regs, sizeof(*rt_sf), 1); | 962 | rt_sf = get_sigframe(ka, get_tm_stackpointer(regs), sizeof(*rt_sf), 1); |
| 969 | addr = rt_sf; | 963 | addr = rt_sf; |
| 970 | if (unlikely(rt_sf == NULL)) | 964 | if (unlikely(rt_sf == NULL)) |
| 971 | goto badframe; | 965 | goto badframe; |
| @@ -1403,7 +1397,7 @@ int handle_signal32(unsigned long sig, struct k_sigaction *ka, | |||
| 1403 | unsigned long tramp; | 1397 | unsigned long tramp; |
| 1404 | 1398 | ||
| 1405 | /* Set up Signal Frame */ | 1399 | /* Set up Signal Frame */ |
| 1406 | frame = get_sigframe(ka, regs, sizeof(*frame), 1); | 1400 | frame = get_sigframe(ka, get_tm_stackpointer(regs), sizeof(*frame), 1); |
| 1407 | if (unlikely(frame == NULL)) | 1401 | if (unlikely(frame == NULL)) |
| 1408 | goto badframe; | 1402 | goto badframe; |
| 1409 | sc = (struct sigcontext __user *) &frame->sctx; | 1403 | sc = (struct sigcontext __user *) &frame->sctx; |
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c index c1794286098c..345947367ec0 100644 --- a/arch/powerpc/kernel/signal_64.c +++ b/arch/powerpc/kernel/signal_64.c | |||
| @@ -154,11 +154,12 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, | |||
| 154 | * As above, but Transactional Memory is in use, so deliver sigcontexts | 154 | * As above, but Transactional Memory is in use, so deliver sigcontexts |
| 155 | * containing checkpointed and transactional register states. | 155 | * containing checkpointed and transactional register states. |
| 156 | * | 156 | * |
| 157 | * To do this, we treclaim to gather both sets of registers and set up the | 157 | * To do this, we treclaim (done before entering here) to gather both sets of |
| 158 | * 'normal' sigcontext registers with rolled-back register values such that a | 158 | * registers and set up the 'normal' sigcontext registers with rolled-back |
| 159 | * simple signal handler sees a correct checkpointed register state. | 159 | * register values such that a simple signal handler sees a correct |
| 160 | * If interested, a TM-aware sighandler can examine the transactional registers | 160 | * checkpointed register state. If interested, a TM-aware sighandler can |
| 161 | * in the 2nd sigcontext to determine the real origin of the signal. | 161 | * examine the transactional registers in the 2nd sigcontext to determine the |
| 162 | * real origin of the signal. | ||
| 162 | */ | 163 | */ |
| 163 | static long setup_tm_sigcontexts(struct sigcontext __user *sc, | 164 | static long setup_tm_sigcontexts(struct sigcontext __user *sc, |
| 164 | struct sigcontext __user *tm_sc, | 165 | struct sigcontext __user *tm_sc, |
| @@ -184,16 +185,6 @@ static long setup_tm_sigcontexts(struct sigcontext __user *sc, | |||
| 184 | 185 | ||
| 185 | BUG_ON(!MSR_TM_ACTIVE(regs->msr)); | 186 | BUG_ON(!MSR_TM_ACTIVE(regs->msr)); |
| 186 | 187 | ||
| 187 | /* tm_reclaim rolls back all reg states, saving checkpointed (older) | ||
| 188 | * GPRs to thread.ckpt_regs and (if used) FPRs to (newer) | ||
| 189 | * thread.transact_fp and/or VRs to (newer) thread.transact_vr. | ||
| 190 | * THEN we save out FP/VRs, if necessary, to the checkpointed (older) | ||
| 191 | * thread.fr[]/vr[]s. The transactional (newer) GPRs are on the | ||
| 192 | * stack, in *regs. | ||
| 193 | */ | ||
| 194 | tm_enable(); | ||
| 195 | tm_reclaim(¤t->thread, msr, TM_CAUSE_SIGNAL); | ||
| 196 | |||
| 197 | flush_fp_to_thread(current); | 188 | flush_fp_to_thread(current); |
| 198 | 189 | ||
| 199 | #ifdef CONFIG_ALTIVEC | 190 | #ifdef CONFIG_ALTIVEC |
| @@ -711,7 +702,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info, | |||
| 711 | unsigned long newsp = 0; | 702 | unsigned long newsp = 0; |
| 712 | long err = 0; | 703 | long err = 0; |
| 713 | 704 | ||
| 714 | frame = get_sigframe(ka, regs, sizeof(*frame), 0); | 705 | frame = get_sigframe(ka, get_tm_stackpointer(regs), sizeof(*frame), 0); |
| 715 | if (unlikely(frame == NULL)) | 706 | if (unlikely(frame == NULL)) |
| 716 | goto badframe; | 707 | goto badframe; |
| 717 | 708 | ||
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index a7a648f6b750..f18c79c324ef 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c | |||
| @@ -53,6 +53,7 @@ | |||
| 53 | #ifdef CONFIG_PPC64 | 53 | #ifdef CONFIG_PPC64 |
| 54 | #include <asm/firmware.h> | 54 | #include <asm/firmware.h> |
| 55 | #include <asm/processor.h> | 55 | #include <asm/processor.h> |
| 56 | #include <asm/tm.h> | ||
| 56 | #endif | 57 | #endif |
| 57 | #include <asm/kexec.h> | 58 | #include <asm/kexec.h> |
| 58 | #include <asm/ppc-opcode.h> | 59 | #include <asm/ppc-opcode.h> |
| @@ -932,6 +933,28 @@ static int emulate_isel(struct pt_regs *regs, u32 instword) | |||
| 932 | return 0; | 933 | return 0; |
| 933 | } | 934 | } |
| 934 | 935 | ||
| 936 | #ifdef CONFIG_PPC_TRANSACTIONAL_MEM | ||
| 937 | static inline bool tm_abort_check(struct pt_regs *regs, int cause) | ||
| 938 | { | ||
| 939 | /* If we're emulating a load/store in an active transaction, we cannot | ||
| 940 | * emulate it as the kernel operates in transaction suspended context. | ||
| 941 | * We need to abort the transaction. This creates a persistent TM | ||
| 942 | * abort so tell the user what caused it with a new code. | ||
| 943 | */ | ||
| 944 | if (MSR_TM_TRANSACTIONAL(regs->msr)) { | ||
| 945 | tm_enable(); | ||
| 946 | tm_abort(cause); | ||
| 947 | return true; | ||
| 948 | } | ||
| 949 | return false; | ||
| 950 | } | ||
| 951 | #else | ||
| 952 | static inline bool tm_abort_check(struct pt_regs *regs, int reason) | ||
| 953 | { | ||
| 954 | return false; | ||
| 955 | } | ||
| 956 | #endif | ||
| 957 | |||
| 935 | static int emulate_instruction(struct pt_regs *regs) | 958 | static int emulate_instruction(struct pt_regs *regs) |
| 936 | { | 959 | { |
| 937 | u32 instword; | 960 | u32 instword; |
| @@ -971,6 +994,9 @@ static int emulate_instruction(struct pt_regs *regs) | |||
| 971 | 994 | ||
| 972 | /* Emulate load/store string insn. */ | 995 | /* Emulate load/store string insn. */ |
| 973 | if ((instword & PPC_INST_STRING_GEN_MASK) == PPC_INST_STRING) { | 996 | if ((instword & PPC_INST_STRING_GEN_MASK) == PPC_INST_STRING) { |
| 997 | if (tm_abort_check(regs, | ||
| 998 | TM_CAUSE_EMULATE | TM_CAUSE_PERSISTENT)) | ||
| 999 | return -EINVAL; | ||
| 974 | PPC_WARN_EMULATED(string, regs); | 1000 | PPC_WARN_EMULATED(string, regs); |
| 975 | return emulate_string_inst(regs, instword); | 1001 | return emulate_string_inst(regs, instword); |
| 976 | } | 1002 | } |
| @@ -1148,6 +1174,9 @@ void alignment_exception(struct pt_regs *regs) | |||
| 1148 | if (!arch_irq_disabled_regs(regs)) | 1174 | if (!arch_irq_disabled_regs(regs)) |
| 1149 | local_irq_enable(); | 1175 | local_irq_enable(); |
| 1150 | 1176 | ||
| 1177 | if (tm_abort_check(regs, TM_CAUSE_ALIGNMENT | TM_CAUSE_PERSISTENT)) | ||
| 1178 | goto bail; | ||
| 1179 | |||
| 1151 | /* we don't implement logging of alignment exceptions */ | 1180 | /* we don't implement logging of alignment exceptions */ |
| 1152 | if (!(current->thread.align_ctl & PR_UNALIGN_SIGBUS)) | 1181 | if (!(current->thread.align_ctl & PR_UNALIGN_SIGBUS)) |
| 1153 | fixed = fix_alignment(regs); | 1182 | fixed = fix_alignment(regs); |
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 9de24f8e03c7..550f5928b394 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c | |||
| @@ -562,6 +562,8 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu) | |||
| 562 | case H_CPPR: | 562 | case H_CPPR: |
| 563 | case H_EOI: | 563 | case H_EOI: |
| 564 | case H_IPI: | 564 | case H_IPI: |
| 565 | case H_IPOLL: | ||
| 566 | case H_XIRR_X: | ||
| 565 | if (kvmppc_xics_enabled(vcpu)) { | 567 | if (kvmppc_xics_enabled(vcpu)) { |
| 566 | ret = kvmppc_xics_hcall(vcpu, req); | 568 | ret = kvmppc_xics_hcall(vcpu, req); |
| 567 | break; | 569 | break; |
diff --git a/arch/powerpc/kvm/book3s_pr_papr.c b/arch/powerpc/kvm/book3s_pr_papr.c index b24309c6c2d5..da0e0bc268bd 100644 --- a/arch/powerpc/kvm/book3s_pr_papr.c +++ b/arch/powerpc/kvm/book3s_pr_papr.c | |||
| @@ -257,6 +257,8 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd) | |||
| 257 | case H_CPPR: | 257 | case H_CPPR: |
| 258 | case H_EOI: | 258 | case H_EOI: |
| 259 | case H_IPI: | 259 | case H_IPI: |
| 260 | case H_IPOLL: | ||
| 261 | case H_XIRR_X: | ||
| 260 | if (kvmppc_xics_enabled(vcpu)) | 262 | if (kvmppc_xics_enabled(vcpu)) |
| 261 | return kvmppc_h_pr_xics_hcall(vcpu, cmd); | 263 | return kvmppc_h_pr_xics_hcall(vcpu, cmd); |
| 262 | break; | 264 | break; |
diff --git a/arch/powerpc/kvm/book3s_xics.c b/arch/powerpc/kvm/book3s_xics.c index f7a103756618..94c1dd46b83d 100644 --- a/arch/powerpc/kvm/book3s_xics.c +++ b/arch/powerpc/kvm/book3s_xics.c | |||
| @@ -650,6 +650,23 @@ static noinline int kvmppc_h_ipi(struct kvm_vcpu *vcpu, unsigned long server, | |||
| 650 | return H_SUCCESS; | 650 | return H_SUCCESS; |
| 651 | } | 651 | } |
| 652 | 652 | ||
| 653 | static int kvmppc_h_ipoll(struct kvm_vcpu *vcpu, unsigned long server) | ||
| 654 | { | ||
| 655 | union kvmppc_icp_state state; | ||
| 656 | struct kvmppc_icp *icp; | ||
| 657 | |||
| 658 | icp = vcpu->arch.icp; | ||
| 659 | if (icp->server_num != server) { | ||
| 660 | icp = kvmppc_xics_find_server(vcpu->kvm, server); | ||
| 661 | if (!icp) | ||
| 662 | return H_PARAMETER; | ||
| 663 | } | ||
| 664 | state = ACCESS_ONCE(icp->state); | ||
| 665 | kvmppc_set_gpr(vcpu, 4, ((u32)state.cppr << 24) | state.xisr); | ||
| 666 | kvmppc_set_gpr(vcpu, 5, state.mfrr); | ||
| 667 | return H_SUCCESS; | ||
| 668 | } | ||
| 669 | |||
| 653 | static noinline void kvmppc_h_cppr(struct kvm_vcpu *vcpu, unsigned long cppr) | 670 | static noinline void kvmppc_h_cppr(struct kvm_vcpu *vcpu, unsigned long cppr) |
| 654 | { | 671 | { |
| 655 | union kvmppc_icp_state old_state, new_state; | 672 | union kvmppc_icp_state old_state, new_state; |
| @@ -787,6 +804,18 @@ int kvmppc_xics_hcall(struct kvm_vcpu *vcpu, u32 req) | |||
| 787 | if (!xics || !vcpu->arch.icp) | 804 | if (!xics || !vcpu->arch.icp) |
| 788 | return H_HARDWARE; | 805 | return H_HARDWARE; |
| 789 | 806 | ||
| 807 | /* These requests don't have real-mode implementations at present */ | ||
| 808 | switch (req) { | ||
| 809 | case H_XIRR_X: | ||
| 810 | res = kvmppc_h_xirr(vcpu); | ||
| 811 | kvmppc_set_gpr(vcpu, 4, res); | ||
| 812 | kvmppc_set_gpr(vcpu, 5, get_tb()); | ||
| 813 | return rc; | ||
| 814 | case H_IPOLL: | ||
| 815 | rc = kvmppc_h_ipoll(vcpu, kvmppc_get_gpr(vcpu, 4)); | ||
| 816 | return rc; | ||
| 817 | } | ||
| 818 | |||
| 790 | /* Check for real mode returning too hard */ | 819 | /* Check for real mode returning too hard */ |
| 791 | if (xics->real_mode) | 820 | if (xics->real_mode) |
| 792 | return kvmppc_xics_rm_complete(vcpu, req); | 821 | return kvmppc_xics_rm_complete(vcpu, req); |
diff --git a/arch/powerpc/lib/copypage_power7.S b/arch/powerpc/lib/copypage_power7.S index 0ef75bf0695c..395c594722a2 100644 --- a/arch/powerpc/lib/copypage_power7.S +++ b/arch/powerpc/lib/copypage_power7.S | |||
| @@ -28,13 +28,14 @@ _GLOBAL(copypage_power7) | |||
| 28 | * aligned we don't need to clear the bottom 7 bits of either | 28 | * aligned we don't need to clear the bottom 7 bits of either |
| 29 | * address. | 29 | * address. |
| 30 | */ | 30 | */ |
| 31 | ori r9,r3,1 /* stream=1 */ | 31 | ori r9,r3,1 /* stream=1 => to */ |
| 32 | 32 | ||
| 33 | #ifdef CONFIG_PPC_64K_PAGES | 33 | #ifdef CONFIG_PPC_64K_PAGES |
| 34 | lis r7,0x0E01 /* depth=7, units=512 */ | 34 | lis r7,0x0E01 /* depth=7 |
| 35 | * units/cachelines=512 */ | ||
| 35 | #else | 36 | #else |
| 36 | lis r7,0x0E00 /* depth=7 */ | 37 | lis r7,0x0E00 /* depth=7 */ |
| 37 | ori r7,r7,0x1000 /* units=32 */ | 38 | ori r7,r7,0x1000 /* units/cachelines=32 */ |
| 38 | #endif | 39 | #endif |
| 39 | ori r10,r7,1 /* stream=1 */ | 40 | ori r10,r7,1 /* stream=1 */ |
| 40 | 41 | ||
| @@ -43,12 +44,14 @@ _GLOBAL(copypage_power7) | |||
| 43 | 44 | ||
| 44 | .machine push | 45 | .machine push |
| 45 | .machine "power4" | 46 | .machine "power4" |
| 46 | dcbt r0,r4,0b01000 | 47 | /* setup read stream 0 */ |
| 47 | dcbt r0,r7,0b01010 | 48 | dcbt r0,r4,0b01000 /* addr from */ |
| 48 | dcbtst r0,r9,0b01000 | 49 | dcbt r0,r7,0b01010 /* length and depth from */ |
| 49 | dcbtst r0,r10,0b01010 | 50 | /* setup write stream 1 */ |
| 51 | dcbtst r0,r9,0b01000 /* addr to */ | ||
| 52 | dcbtst r0,r10,0b01010 /* length and depth to */ | ||
| 50 | eieio | 53 | eieio |
| 51 | dcbt r0,r8,0b01010 /* GO */ | 54 | dcbt r0,r8,0b01010 /* all streams GO */ |
| 52 | .machine pop | 55 | .machine pop |
| 53 | 56 | ||
| 54 | #ifdef CONFIG_ALTIVEC | 57 | #ifdef CONFIG_ALTIVEC |
diff --git a/arch/powerpc/lib/copyuser_power7.S b/arch/powerpc/lib/copyuser_power7.S index 0d24ff15f5f6..d1f11795a7ad 100644 --- a/arch/powerpc/lib/copyuser_power7.S +++ b/arch/powerpc/lib/copyuser_power7.S | |||
| @@ -318,12 +318,14 @@ err1; stb r0,0(r3) | |||
| 318 | 318 | ||
| 319 | .machine push | 319 | .machine push |
| 320 | .machine "power4" | 320 | .machine "power4" |
| 321 | dcbt r0,r6,0b01000 | 321 | /* setup read stream 0 */ |
| 322 | dcbt r0,r7,0b01010 | 322 | dcbt r0,r6,0b01000 /* addr from */ |
| 323 | dcbtst r0,r9,0b01000 | 323 | dcbt r0,r7,0b01010 /* length and depth from */ |
| 324 | dcbtst r0,r10,0b01010 | 324 | /* setup write stream 1 */ |
| 325 | dcbtst r0,r9,0b01000 /* addr to */ | ||
| 326 | dcbtst r0,r10,0b01010 /* length and depth to */ | ||
| 325 | eieio | 327 | eieio |
| 326 | dcbt r0,r8,0b01010 /* GO */ | 328 | dcbt r0,r8,0b01010 /* all streams GO */ |
| 327 | .machine pop | 329 | .machine pop |
| 328 | 330 | ||
| 329 | beq cr1,.Lunwind_stack_nonvmx_copy | 331 | beq cr1,.Lunwind_stack_nonvmx_copy |
diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c index 6a2aead5b0e5..4c122c3f1623 100644 --- a/arch/powerpc/mm/hash_native_64.c +++ b/arch/powerpc/mm/hash_native_64.c | |||
| @@ -336,11 +336,18 @@ static long native_hpte_updatepp(unsigned long slot, unsigned long newpp, | |||
| 336 | 336 | ||
| 337 | hpte_v = hptep->v; | 337 | hpte_v = hptep->v; |
| 338 | actual_psize = hpte_actual_psize(hptep, psize); | 338 | actual_psize = hpte_actual_psize(hptep, psize); |
| 339 | /* | ||
| 340 | * We need to invalidate the TLB always because hpte_remove doesn't do | ||
| 341 | * a tlb invalidate. If a hash bucket gets full, we "evict" a more/less | ||
| 342 | * random entry from it. When we do that we don't invalidate the TLB | ||
| 343 | * (hpte_remove) because we assume the old translation is still | ||
| 344 | * technically "valid". | ||
| 345 | */ | ||
| 339 | if (actual_psize < 0) { | 346 | if (actual_psize < 0) { |
| 340 | native_unlock_hpte(hptep); | 347 | actual_psize = psize; |
| 341 | return -1; | 348 | ret = -1; |
| 349 | goto err_out; | ||
| 342 | } | 350 | } |
| 343 | /* Even if we miss, we need to invalidate the TLB */ | ||
| 344 | if (!HPTE_V_COMPARE(hpte_v, want_v)) { | 351 | if (!HPTE_V_COMPARE(hpte_v, want_v)) { |
| 345 | DBG_LOW(" -> miss\n"); | 352 | DBG_LOW(" -> miss\n"); |
| 346 | ret = -1; | 353 | ret = -1; |
| @@ -350,6 +357,7 @@ static long native_hpte_updatepp(unsigned long slot, unsigned long newpp, | |||
| 350 | hptep->r = (hptep->r & ~(HPTE_R_PP | HPTE_R_N)) | | 357 | hptep->r = (hptep->r & ~(HPTE_R_PP | HPTE_R_N)) | |
| 351 | (newpp & (HPTE_R_PP | HPTE_R_N | HPTE_R_C)); | 358 | (newpp & (HPTE_R_PP | HPTE_R_N | HPTE_R_C)); |
| 352 | } | 359 | } |
| 360 | err_out: | ||
| 353 | native_unlock_hpte(hptep); | 361 | native_unlock_hpte(hptep); |
| 354 | 362 | ||
| 355 | /* Ensure it is out of the tlb too. */ | 363 | /* Ensure it is out of the tlb too. */ |
| @@ -409,7 +417,7 @@ static void native_hpte_updateboltedpp(unsigned long newpp, unsigned long ea, | |||
| 409 | hptep = htab_address + slot; | 417 | hptep = htab_address + slot; |
| 410 | actual_psize = hpte_actual_psize(hptep, psize); | 418 | actual_psize = hpte_actual_psize(hptep, psize); |
| 411 | if (actual_psize < 0) | 419 | if (actual_psize < 0) |
| 412 | return; | 420 | actual_psize = psize; |
| 413 | 421 | ||
| 414 | /* Update the HPTE */ | 422 | /* Update the HPTE */ |
| 415 | hptep->r = (hptep->r & ~(HPTE_R_PP | HPTE_R_N)) | | 423 | hptep->r = (hptep->r & ~(HPTE_R_PP | HPTE_R_N)) | |
| @@ -437,21 +445,27 @@ static void native_hpte_invalidate(unsigned long slot, unsigned long vpn, | |||
| 437 | hpte_v = hptep->v; | 445 | hpte_v = hptep->v; |
| 438 | 446 | ||
| 439 | actual_psize = hpte_actual_psize(hptep, psize); | 447 | actual_psize = hpte_actual_psize(hptep, psize); |
| 448 | /* | ||
| 449 | * We need to invalidate the TLB always because hpte_remove doesn't do | ||
| 450 | * a tlb invalidate. If a hash bucket gets full, we "evict" a more/less | ||
| 451 | * random entry from it. When we do that we don't invalidate the TLB | ||
| 452 | * (hpte_remove) because we assume the old translation is still | ||
| 453 | * technically "valid". | ||
| 454 | */ | ||
| 440 | if (actual_psize < 0) { | 455 | if (actual_psize < 0) { |
| 456 | actual_psize = psize; | ||
| 441 | native_unlock_hpte(hptep); | 457 | native_unlock_hpte(hptep); |
| 442 | local_irq_restore(flags); | 458 | goto err_out; |
| 443 | return; | ||
| 444 | } | 459 | } |
| 445 | /* Even if we miss, we need to invalidate the TLB */ | ||
| 446 | if (!HPTE_V_COMPARE(hpte_v, want_v)) | 460 | if (!HPTE_V_COMPARE(hpte_v, want_v)) |
| 447 | native_unlock_hpte(hptep); | 461 | native_unlock_hpte(hptep); |
| 448 | else | 462 | else |
| 449 | /* Invalidate the hpte. NOTE: this also unlocks it */ | 463 | /* Invalidate the hpte. NOTE: this also unlocks it */ |
| 450 | hptep->v = 0; | 464 | hptep->v = 0; |
| 451 | 465 | ||
| 466 | err_out: | ||
| 452 | /* Invalidate the TLB */ | 467 | /* Invalidate the TLB */ |
| 453 | tlbie(vpn, psize, actual_psize, ssize, local); | 468 | tlbie(vpn, psize, actual_psize, ssize, local); |
| 454 | |||
| 455 | local_irq_restore(flags); | 469 | local_irq_restore(flags); |
| 456 | } | 470 | } |
| 457 | 471 | ||
diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c index 426180b84978..845c867444e6 100644 --- a/arch/powerpc/perf/core-book3s.c +++ b/arch/powerpc/perf/core-book3s.c | |||
| @@ -110,7 +110,7 @@ static inline void power_pmu_bhrb_read(struct cpu_hw_events *cpuhw) {} | |||
| 110 | 110 | ||
| 111 | static bool regs_use_siar(struct pt_regs *regs) | 111 | static bool regs_use_siar(struct pt_regs *regs) |
| 112 | { | 112 | { |
| 113 | return !!(regs->result & 1); | 113 | return !!regs->result; |
| 114 | } | 114 | } |
| 115 | 115 | ||
| 116 | /* | 116 | /* |
| @@ -136,22 +136,30 @@ static inline unsigned long perf_ip_adjust(struct pt_regs *regs) | |||
| 136 | * If we're not doing instruction sampling, give them the SDAR | 136 | * If we're not doing instruction sampling, give them the SDAR |
| 137 | * (sampled data address). If we are doing instruction sampling, then | 137 | * (sampled data address). If we are doing instruction sampling, then |
| 138 | * only give them the SDAR if it corresponds to the instruction | 138 | * only give them the SDAR if it corresponds to the instruction |
| 139 | * pointed to by SIAR; this is indicated by the [POWER6_]MMCRA_SDSYNC or | 139 | * pointed to by SIAR; this is indicated by the [POWER6_]MMCRA_SDSYNC, the |
| 140 | * the [POWER7P_]MMCRA_SDAR_VALID bit in MMCRA. | 140 | * [POWER7P_]MMCRA_SDAR_VALID bit in MMCRA, or the SDAR_VALID bit in SIER. |
| 141 | */ | 141 | */ |
| 142 | static inline void perf_get_data_addr(struct pt_regs *regs, u64 *addrp) | 142 | static inline void perf_get_data_addr(struct pt_regs *regs, u64 *addrp) |
| 143 | { | 143 | { |
| 144 | unsigned long mmcra = regs->dsisr; | 144 | unsigned long mmcra = regs->dsisr; |
| 145 | unsigned long sdsync; | 145 | bool sdar_valid; |
| 146 | 146 | ||
| 147 | if (ppmu->flags & PPMU_SIAR_VALID) | 147 | if (ppmu->flags & PPMU_HAS_SIER) |
| 148 | sdsync = POWER7P_MMCRA_SDAR_VALID; | 148 | sdar_valid = regs->dar & SIER_SDAR_VALID; |
| 149 | else if (ppmu->flags & PPMU_ALT_SIPR) | 149 | else { |
| 150 | sdsync = POWER6_MMCRA_SDSYNC; | 150 | unsigned long sdsync; |
| 151 | else | 151 | |
| 152 | sdsync = MMCRA_SDSYNC; | 152 | if (ppmu->flags & PPMU_SIAR_VALID) |
| 153 | sdsync = POWER7P_MMCRA_SDAR_VALID; | ||
| 154 | else if (ppmu->flags & PPMU_ALT_SIPR) | ||
| 155 | sdsync = POWER6_MMCRA_SDSYNC; | ||
| 156 | else | ||
| 157 | sdsync = MMCRA_SDSYNC; | ||
| 158 | |||
| 159 | sdar_valid = mmcra & sdsync; | ||
| 160 | } | ||
| 153 | 161 | ||
| 154 | if (!(mmcra & MMCRA_SAMPLE_ENABLE) || (mmcra & sdsync)) | 162 | if (!(mmcra & MMCRA_SAMPLE_ENABLE) || sdar_valid) |
| 155 | *addrp = mfspr(SPRN_SDAR); | 163 | *addrp = mfspr(SPRN_SDAR); |
| 156 | } | 164 | } |
| 157 | 165 | ||
| @@ -181,11 +189,6 @@ static bool regs_sipr(struct pt_regs *regs) | |||
| 181 | return !!(regs->dsisr & sipr); | 189 | return !!(regs->dsisr & sipr); |
| 182 | } | 190 | } |
| 183 | 191 | ||
| 184 | static bool regs_no_sipr(struct pt_regs *regs) | ||
| 185 | { | ||
| 186 | return !!(regs->result & 2); | ||
| 187 | } | ||
| 188 | |||
| 189 | static inline u32 perf_flags_from_msr(struct pt_regs *regs) | 192 | static inline u32 perf_flags_from_msr(struct pt_regs *regs) |
| 190 | { | 193 | { |
| 191 | if (regs->msr & MSR_PR) | 194 | if (regs->msr & MSR_PR) |
| @@ -208,7 +211,7 @@ static inline u32 perf_get_misc_flags(struct pt_regs *regs) | |||
| 208 | * SIAR which should give slightly more reliable | 211 | * SIAR which should give slightly more reliable |
| 209 | * results | 212 | * results |
| 210 | */ | 213 | */ |
| 211 | if (regs_no_sipr(regs)) { | 214 | if (ppmu->flags & PPMU_NO_SIPR) { |
| 212 | unsigned long siar = mfspr(SPRN_SIAR); | 215 | unsigned long siar = mfspr(SPRN_SIAR); |
| 213 | if (siar >= PAGE_OFFSET) | 216 | if (siar >= PAGE_OFFSET) |
| 214 | return PERF_RECORD_MISC_KERNEL; | 217 | return PERF_RECORD_MISC_KERNEL; |
| @@ -239,22 +242,9 @@ static inline void perf_read_regs(struct pt_regs *regs) | |||
| 239 | int use_siar; | 242 | int use_siar; |
| 240 | 243 | ||
| 241 | regs->dsisr = mmcra; | 244 | regs->dsisr = mmcra; |
| 242 | regs->result = 0; | ||
| 243 | |||
| 244 | if (ppmu->flags & PPMU_NO_SIPR) | ||
| 245 | regs->result |= 2; | ||
| 246 | |||
| 247 | /* | ||
| 248 | * On power8 if we're in random sampling mode, the SIER is updated. | ||
| 249 | * If we're in continuous sampling mode, we don't have SIPR. | ||
| 250 | */ | ||
| 251 | if (ppmu->flags & PPMU_HAS_SIER) { | ||
| 252 | if (marked) | ||
| 253 | regs->dar = mfspr(SPRN_SIER); | ||
| 254 | else | ||
| 255 | regs->result |= 2; | ||
| 256 | } | ||
| 257 | 245 | ||
| 246 | if (ppmu->flags & PPMU_HAS_SIER) | ||
| 247 | regs->dar = mfspr(SPRN_SIER); | ||
| 258 | 248 | ||
| 259 | /* | 249 | /* |
| 260 | * If this isn't a PMU exception (eg a software event) the SIAR is | 250 | * If this isn't a PMU exception (eg a software event) the SIAR is |
| @@ -279,12 +269,12 @@ static inline void perf_read_regs(struct pt_regs *regs) | |||
| 279 | use_siar = 1; | 269 | use_siar = 1; |
| 280 | else if ((ppmu->flags & PPMU_NO_CONT_SAMPLING)) | 270 | else if ((ppmu->flags & PPMU_NO_CONT_SAMPLING)) |
| 281 | use_siar = 0; | 271 | use_siar = 0; |
| 282 | else if (!regs_no_sipr(regs) && regs_sipr(regs)) | 272 | else if (!(ppmu->flags & PPMU_NO_SIPR) && regs_sipr(regs)) |
| 283 | use_siar = 0; | 273 | use_siar = 0; |
| 284 | else | 274 | else |
| 285 | use_siar = 1; | 275 | use_siar = 1; |
| 286 | 276 | ||
| 287 | regs->result |= use_siar; | 277 | regs->result = use_siar; |
| 288 | } | 278 | } |
| 289 | 279 | ||
| 290 | /* | 280 | /* |
| @@ -308,8 +298,13 @@ static inline int siar_valid(struct pt_regs *regs) | |||
| 308 | unsigned long mmcra = regs->dsisr; | 298 | unsigned long mmcra = regs->dsisr; |
| 309 | int marked = mmcra & MMCRA_SAMPLE_ENABLE; | 299 | int marked = mmcra & MMCRA_SAMPLE_ENABLE; |
| 310 | 300 | ||
| 311 | if ((ppmu->flags & PPMU_SIAR_VALID) && marked) | 301 | if (marked) { |
| 312 | return mmcra & POWER7P_MMCRA_SIAR_VALID; | 302 | if (ppmu->flags & PPMU_HAS_SIER) |
| 303 | return regs->dar & SIER_SIAR_VALID; | ||
| 304 | |||
| 305 | if (ppmu->flags & PPMU_SIAR_VALID) | ||
| 306 | return mmcra & POWER7P_MMCRA_SIAR_VALID; | ||
| 307 | } | ||
| 313 | 308 | ||
| 314 | return 1; | 309 | return 1; |
| 315 | } | 310 | } |
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig index 023b288f895b..4459eff7a75a 100644 --- a/arch/powerpc/platforms/pseries/Kconfig +++ b/arch/powerpc/platforms/pseries/Kconfig | |||
| @@ -19,6 +19,8 @@ config PPC_PSERIES | |||
| 19 | select ZLIB_DEFLATE | 19 | select ZLIB_DEFLATE |
| 20 | select PPC_DOORBELL | 20 | select PPC_DOORBELL |
| 21 | select HAVE_CONTEXT_TRACKING | 21 | select HAVE_CONTEXT_TRACKING |
| 22 | select HOTPLUG if SMP | ||
| 23 | select HOTPLUG_CPU if SMP | ||
| 22 | default y | 24 | default y |
| 23 | 25 | ||
| 24 | config PPC_SPLPAR | 26 | config PPC_SPLPAR |
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 0a13ecb270c7..3cc2f9159ab1 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
| @@ -54,7 +54,7 @@ static DEFINE_RAW_SPINLOCK(mpic_lock); | |||
| 54 | 54 | ||
| 55 | #ifdef CONFIG_PPC32 /* XXX for now */ | 55 | #ifdef CONFIG_PPC32 /* XXX for now */ |
| 56 | #ifdef CONFIG_IRQ_ALL_CPUS | 56 | #ifdef CONFIG_IRQ_ALL_CPUS |
| 57 | #define distribute_irqs (!(mpic->flags & MPIC_SINGLE_DEST_CPU)) | 57 | #define distribute_irqs (1) |
| 58 | #else | 58 | #else |
| 59 | #define distribute_irqs (0) | 59 | #define distribute_irqs (0) |
| 60 | #endif | 60 | #endif |
| @@ -1703,7 +1703,7 @@ void mpic_setup_this_cpu(void) | |||
| 1703 | * it differently, then we should make sure we also change the default | 1703 | * it differently, then we should make sure we also change the default |
| 1704 | * values of irq_desc[].affinity in irq.c. | 1704 | * values of irq_desc[].affinity in irq.c. |
| 1705 | */ | 1705 | */ |
| 1706 | if (distribute_irqs) { | 1706 | if (distribute_irqs && !(mpic->flags & MPIC_SINGLE_DEST_CPU)) { |
| 1707 | for (i = 0; i < mpic->num_sources ; i++) | 1707 | for (i = 0; i < mpic->num_sources ; i++) |
| 1708 | mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), | 1708 | mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), |
| 1709 | mpic_irq_read(i, MPIC_INFO(IRQ_DESTINATION)) | msk); | 1709 | mpic_irq_read(i, MPIC_INFO(IRQ_DESTINATION)) | msk); |
diff --git a/arch/x86/crypto/crc32-pclmul_asm.S b/arch/x86/crypto/crc32-pclmul_asm.S index 94c27df8a549..f247304299a2 100644 --- a/arch/x86/crypto/crc32-pclmul_asm.S +++ b/arch/x86/crypto/crc32-pclmul_asm.S | |||
| @@ -240,7 +240,7 @@ fold_64: | |||
| 240 | pand %xmm3, %xmm1 | 240 | pand %xmm3, %xmm1 |
| 241 | PCLMULQDQ 0x00, CONSTANT, %xmm1 | 241 | PCLMULQDQ 0x00, CONSTANT, %xmm1 |
| 242 | pxor %xmm2, %xmm1 | 242 | pxor %xmm2, %xmm1 |
| 243 | pextrd $0x01, %xmm1, %eax | 243 | PEXTRD 0x01, %xmm1, %eax |
| 244 | 244 | ||
| 245 | ret | 245 | ret |
| 246 | ENDPROC(crc32_pclmul_le_16) | 246 | ENDPROC(crc32_pclmul_le_16) |
diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S index 56610c4bf31b..642f15687a0a 100644 --- a/arch/x86/crypto/sha256-avx-asm.S +++ b/arch/x86/crypto/sha256-avx-asm.S | |||
| @@ -118,7 +118,7 @@ y2 = %r15d | |||
| 118 | 118 | ||
| 119 | _INP_END_SIZE = 8 | 119 | _INP_END_SIZE = 8 |
| 120 | _INP_SIZE = 8 | 120 | _INP_SIZE = 8 |
| 121 | _XFER_SIZE = 8 | 121 | _XFER_SIZE = 16 |
| 122 | _XMM_SAVE_SIZE = 0 | 122 | _XMM_SAVE_SIZE = 0 |
| 123 | 123 | ||
| 124 | _INP_END = 0 | 124 | _INP_END = 0 |
diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S index 98d3c391da81..f833b74d902b 100644 --- a/arch/x86/crypto/sha256-ssse3-asm.S +++ b/arch/x86/crypto/sha256-ssse3-asm.S | |||
| @@ -111,7 +111,7 @@ y2 = %r15d | |||
| 111 | 111 | ||
| 112 | _INP_END_SIZE = 8 | 112 | _INP_END_SIZE = 8 |
| 113 | _INP_SIZE = 8 | 113 | _INP_SIZE = 8 |
| 114 | _XFER_SIZE = 8 | 114 | _XFER_SIZE = 16 |
| 115 | _XMM_SAVE_SIZE = 0 | 115 | _XMM_SAVE_SIZE = 0 |
| 116 | 116 | ||
| 117 | _INP_END = 0 | 117 | _INP_END = 0 |
diff --git a/arch/x86/include/asm/inst.h b/arch/x86/include/asm/inst.h index 280bf7fb6aba..3e115273ed88 100644 --- a/arch/x86/include/asm/inst.h +++ b/arch/x86/include/asm/inst.h | |||
| @@ -9,12 +9,68 @@ | |||
| 9 | 9 | ||
| 10 | #define REG_NUM_INVALID 100 | 10 | #define REG_NUM_INVALID 100 |
| 11 | 11 | ||
| 12 | #define REG_TYPE_R64 0 | 12 | #define REG_TYPE_R32 0 |
| 13 | #define REG_TYPE_XMM 1 | 13 | #define REG_TYPE_R64 1 |
| 14 | #define REG_TYPE_XMM 2 | ||
| 14 | #define REG_TYPE_INVALID 100 | 15 | #define REG_TYPE_INVALID 100 |
| 15 | 16 | ||
| 17 | .macro R32_NUM opd r32 | ||
| 18 | \opd = REG_NUM_INVALID | ||
| 19 | .ifc \r32,%eax | ||
| 20 | \opd = 0 | ||
| 21 | .endif | ||
| 22 | .ifc \r32,%ecx | ||
| 23 | \opd = 1 | ||
| 24 | .endif | ||
| 25 | .ifc \r32,%edx | ||
| 26 | \opd = 2 | ||
| 27 | .endif | ||
| 28 | .ifc \r32,%ebx | ||
| 29 | \opd = 3 | ||
| 30 | .endif | ||
| 31 | .ifc \r32,%esp | ||
| 32 | \opd = 4 | ||
| 33 | .endif | ||
| 34 | .ifc \r32,%ebp | ||
| 35 | \opd = 5 | ||
| 36 | .endif | ||
| 37 | .ifc \r32,%esi | ||
| 38 | \opd = 6 | ||
| 39 | .endif | ||
| 40 | .ifc \r32,%edi | ||
| 41 | \opd = 7 | ||
| 42 | .endif | ||
| 43 | #ifdef CONFIG_X86_64 | ||
| 44 | .ifc \r32,%r8d | ||
| 45 | \opd = 8 | ||
| 46 | .endif | ||
| 47 | .ifc \r32,%r9d | ||
| 48 | \opd = 9 | ||
| 49 | .endif | ||
| 50 | .ifc \r32,%r10d | ||
| 51 | \opd = 10 | ||
| 52 | .endif | ||
| 53 | .ifc \r32,%r11d | ||
| 54 | \opd = 11 | ||
| 55 | .endif | ||
| 56 | .ifc \r32,%r12d | ||
| 57 | \opd = 12 | ||
| 58 | .endif | ||
| 59 | .ifc \r32,%r13d | ||
| 60 | \opd = 13 | ||
| 61 | .endif | ||
| 62 | .ifc \r32,%r14d | ||
| 63 | \opd = 14 | ||
| 64 | .endif | ||
| 65 | .ifc \r32,%r15d | ||
| 66 | \opd = 15 | ||
| 67 | .endif | ||
| 68 | #endif | ||
| 69 | .endm | ||
| 70 | |||
| 16 | .macro R64_NUM opd r64 | 71 | .macro R64_NUM opd r64 |
| 17 | \opd = REG_NUM_INVALID | 72 | \opd = REG_NUM_INVALID |
| 73 | #ifdef CONFIG_X86_64 | ||
| 18 | .ifc \r64,%rax | 74 | .ifc \r64,%rax |
| 19 | \opd = 0 | 75 | \opd = 0 |
| 20 | .endif | 76 | .endif |
| @@ -63,6 +119,7 @@ | |||
| 63 | .ifc \r64,%r15 | 119 | .ifc \r64,%r15 |
| 64 | \opd = 15 | 120 | \opd = 15 |
| 65 | .endif | 121 | .endif |
| 122 | #endif | ||
| 66 | .endm | 123 | .endm |
| 67 | 124 | ||
| 68 | .macro XMM_NUM opd xmm | 125 | .macro XMM_NUM opd xmm |
| @@ -118,10 +175,13 @@ | |||
| 118 | .endm | 175 | .endm |
| 119 | 176 | ||
| 120 | .macro REG_TYPE type reg | 177 | .macro REG_TYPE type reg |
| 178 | R32_NUM reg_type_r32 \reg | ||
| 121 | R64_NUM reg_type_r64 \reg | 179 | R64_NUM reg_type_r64 \reg |
| 122 | XMM_NUM reg_type_xmm \reg | 180 | XMM_NUM reg_type_xmm \reg |
| 123 | .if reg_type_r64 <> REG_NUM_INVALID | 181 | .if reg_type_r64 <> REG_NUM_INVALID |
| 124 | \type = REG_TYPE_R64 | 182 | \type = REG_TYPE_R64 |
| 183 | .elseif reg_type_r32 <> REG_NUM_INVALID | ||
| 184 | \type = REG_TYPE_R32 | ||
| 125 | .elseif reg_type_xmm <> REG_NUM_INVALID | 185 | .elseif reg_type_xmm <> REG_NUM_INVALID |
| 126 | \type = REG_TYPE_XMM | 186 | \type = REG_TYPE_XMM |
| 127 | .else | 187 | .else |
| @@ -162,6 +222,16 @@ | |||
| 162 | .byte \imm8 | 222 | .byte \imm8 |
| 163 | .endm | 223 | .endm |
| 164 | 224 | ||
| 225 | .macro PEXTRD imm8 xmm gpr | ||
| 226 | R32_NUM extrd_opd1 \gpr | ||
| 227 | XMM_NUM extrd_opd2 \xmm | ||
| 228 | PFX_OPD_SIZE | ||
| 229 | PFX_REX extrd_opd1 extrd_opd2 | ||
| 230 | .byte 0x0f, 0x3a, 0x16 | ||
| 231 | MODRM 0xc0 extrd_opd1 extrd_opd2 | ||
| 232 | .byte \imm8 | ||
| 233 | .endm | ||
| 234 | |||
| 165 | .macro AESKEYGENASSIST rcon xmm1 xmm2 | 235 | .macro AESKEYGENASSIST rcon xmm1 xmm2 |
| 166 | XMM_NUM aeskeygen_opd1 \xmm1 | 236 | XMM_NUM aeskeygen_opd1 \xmm1 |
| 167 | XMM_NUM aeskeygen_opd2 \xmm2 | 237 | XMM_NUM aeskeygen_opd2 \xmm2 |
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index 08f7e8039099..321d65ebaffe 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S | |||
| @@ -115,8 +115,10 @@ startup_64: | |||
| 115 | movq %rdi, %rax | 115 | movq %rdi, %rax |
| 116 | shrq $PUD_SHIFT, %rax | 116 | shrq $PUD_SHIFT, %rax |
| 117 | andl $(PTRS_PER_PUD-1), %eax | 117 | andl $(PTRS_PER_PUD-1), %eax |
| 118 | movq %rdx, (4096+0)(%rbx,%rax,8) | 118 | movq %rdx, 4096(%rbx,%rax,8) |
| 119 | movq %rdx, (4096+8)(%rbx,%rax,8) | 119 | incl %eax |
| 120 | andl $(PTRS_PER_PUD-1), %eax | ||
| 121 | movq %rdx, 4096(%rbx,%rax,8) | ||
| 120 | 122 | ||
| 121 | addq $8192, %rbx | 123 | addq $8192, %rbx |
| 122 | movq %rdi, %rax | 124 | movq %rdi, %rax |
diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c index 245a71db401a..cb339097b9ea 100644 --- a/arch/x86/kernel/i387.c +++ b/arch/x86/kernel/i387.c | |||
| @@ -22,23 +22,19 @@ | |||
| 22 | /* | 22 | /* |
| 23 | * Were we in an interrupt that interrupted kernel mode? | 23 | * Were we in an interrupt that interrupted kernel mode? |
| 24 | * | 24 | * |
| 25 | * For now, with eagerfpu we will return interrupted kernel FPU | ||
| 26 | * state as not-idle. TBD: Ideally we can change the return value | ||
| 27 | * to something like __thread_has_fpu(current). But we need to | ||
| 28 | * be careful of doing __thread_clear_has_fpu() before saving | ||
| 29 | * the FPU etc for supporting nested uses etc. For now, take | ||
| 30 | * the simple route! | ||
| 31 | * | ||
| 32 | * On others, we can do a kernel_fpu_begin/end() pair *ONLY* if that | 25 | * On others, we can do a kernel_fpu_begin/end() pair *ONLY* if that |
| 33 | * pair does nothing at all: the thread must not have fpu (so | 26 | * pair does nothing at all: the thread must not have fpu (so |
| 34 | * that we don't try to save the FPU state), and TS must | 27 | * that we don't try to save the FPU state), and TS must |
| 35 | * be set (so that the clts/stts pair does nothing that is | 28 | * be set (so that the clts/stts pair does nothing that is |
| 36 | * visible in the interrupted kernel thread). | 29 | * visible in the interrupted kernel thread). |
| 30 | * | ||
| 31 | * Except for the eagerfpu case when we return 1 unless we've already | ||
| 32 | * been eager and saved the state in kernel_fpu_begin(). | ||
| 37 | */ | 33 | */ |
| 38 | static inline bool interrupted_kernel_fpu_idle(void) | 34 | static inline bool interrupted_kernel_fpu_idle(void) |
| 39 | { | 35 | { |
| 40 | if (use_eager_fpu()) | 36 | if (use_eager_fpu()) |
| 41 | return 0; | 37 | return __thread_has_fpu(current); |
| 42 | 38 | ||
| 43 | return !__thread_has_fpu(current) && | 39 | return !__thread_has_fpu(current) && |
| 44 | (read_cr0() & X86_CR0_TS); | 40 | (read_cr0() & X86_CR0_TS); |
| @@ -78,8 +74,8 @@ void __kernel_fpu_begin(void) | |||
| 78 | struct task_struct *me = current; | 74 | struct task_struct *me = current; |
| 79 | 75 | ||
| 80 | if (__thread_has_fpu(me)) { | 76 | if (__thread_has_fpu(me)) { |
| 81 | __save_init_fpu(me); | ||
| 82 | __thread_clear_has_fpu(me); | 77 | __thread_clear_has_fpu(me); |
| 78 | __save_init_fpu(me); | ||
| 83 | /* We do 'stts()' in __kernel_fpu_end() */ | 79 | /* We do 'stts()' in __kernel_fpu_end() */ |
| 84 | } else if (!use_eager_fpu()) { | 80 | } else if (!use_eager_fpu()) { |
| 85 | this_cpu_write(fpu_owner_task, NULL); | 81 | this_cpu_write(fpu_owner_task, NULL); |
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index 55856b2310d3..82089d8b1954 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c | |||
| @@ -206,7 +206,7 @@ static efi_status_t virt_efi_get_next_variable(unsigned long *name_size, | |||
| 206 | } | 206 | } |
| 207 | 207 | ||
| 208 | if (boot_used_size && !finished) { | 208 | if (boot_used_size && !finished) { |
| 209 | unsigned long size; | 209 | unsigned long size = 0; |
| 210 | u32 attr; | 210 | u32 attr; |
| 211 | efi_status_t s; | 211 | efi_status_t s; |
| 212 | void *tmp; | 212 | void *tmp; |
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index 8ff37995d54e..fb44426fe931 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c | |||
| @@ -576,24 +576,22 @@ void xen_send_IPI_mask_allbutself(const struct cpumask *mask, | |||
| 576 | { | 576 | { |
| 577 | unsigned cpu; | 577 | unsigned cpu; |
| 578 | unsigned int this_cpu = smp_processor_id(); | 578 | unsigned int this_cpu = smp_processor_id(); |
| 579 | int xen_vector = xen_map_vector(vector); | ||
| 579 | 580 | ||
| 580 | if (!(num_online_cpus() > 1)) | 581 | if (!(num_online_cpus() > 1) || (xen_vector < 0)) |
| 581 | return; | 582 | return; |
| 582 | 583 | ||
| 583 | for_each_cpu_and(cpu, mask, cpu_online_mask) { | 584 | for_each_cpu_and(cpu, mask, cpu_online_mask) { |
| 584 | if (this_cpu == cpu) | 585 | if (this_cpu == cpu) |
| 585 | continue; | 586 | continue; |
| 586 | 587 | ||
| 587 | xen_smp_send_call_function_single_ipi(cpu); | 588 | xen_send_IPI_one(cpu, xen_vector); |
| 588 | } | 589 | } |
| 589 | } | 590 | } |
| 590 | 591 | ||
| 591 | void xen_send_IPI_allbutself(int vector) | 592 | void xen_send_IPI_allbutself(int vector) |
| 592 | { | 593 | { |
| 593 | int xen_vector = xen_map_vector(vector); | 594 | xen_send_IPI_mask_allbutself(cpu_online_mask, vector); |
| 594 | |||
| 595 | if (xen_vector >= 0) | ||
| 596 | xen_send_IPI_mask_allbutself(cpu_online_mask, xen_vector); | ||
| 597 | } | 595 | } |
| 598 | 596 | ||
| 599 | static irqreturn_t xen_call_function_interrupt(int irq, void *dev_id) | 597 | static irqreturn_t xen_call_function_interrupt(int irq, void *dev_id) |
diff --git a/arch/x86/xen/smp.h b/arch/x86/xen/smp.h index 8981a76d081a..c7c2d89efd76 100644 --- a/arch/x86/xen/smp.h +++ b/arch/x86/xen/smp.h | |||
| @@ -5,7 +5,6 @@ extern void xen_send_IPI_mask(const struct cpumask *mask, | |||
| 5 | extern void xen_send_IPI_mask_allbutself(const struct cpumask *mask, | 5 | extern void xen_send_IPI_mask_allbutself(const struct cpumask *mask, |
| 6 | int vector); | 6 | int vector); |
| 7 | extern void xen_send_IPI_allbutself(int vector); | 7 | extern void xen_send_IPI_allbutself(int vector); |
| 8 | extern void physflat_send_IPI_allbutself(int vector); | ||
| 9 | extern void xen_send_IPI_all(int vector); | 8 | extern void xen_send_IPI_all(int vector); |
| 10 | extern void xen_send_IPI_self(int vector); | 9 | extern void xen_send_IPI_self(int vector); |
| 11 | 10 | ||
diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c index fefc2ca7cc3e..33dc6a004802 100644 --- a/drivers/acpi/apei/cper.c +++ b/drivers/acpi/apei/cper.c | |||
| @@ -250,10 +250,6 @@ static const char *cper_pcie_port_type_strs[] = { | |||
| 250 | static void cper_print_pcie(const char *pfx, const struct cper_sec_pcie *pcie, | 250 | static void cper_print_pcie(const char *pfx, const struct cper_sec_pcie *pcie, |
| 251 | const struct acpi_hest_generic_data *gdata) | 251 | const struct acpi_hest_generic_data *gdata) |
| 252 | { | 252 | { |
| 253 | #ifdef CONFIG_ACPI_APEI_PCIEAER | ||
| 254 | struct pci_dev *dev; | ||
| 255 | #endif | ||
| 256 | |||
| 257 | if (pcie->validation_bits & CPER_PCIE_VALID_PORT_TYPE) | 253 | if (pcie->validation_bits & CPER_PCIE_VALID_PORT_TYPE) |
| 258 | printk("%s""port_type: %d, %s\n", pfx, pcie->port_type, | 254 | printk("%s""port_type: %d, %s\n", pfx, pcie->port_type, |
| 259 | pcie->port_type < ARRAY_SIZE(cper_pcie_port_type_strs) ? | 255 | pcie->port_type < ARRAY_SIZE(cper_pcie_port_type_strs) ? |
| @@ -285,20 +281,6 @@ static void cper_print_pcie(const char *pfx, const struct cper_sec_pcie *pcie, | |||
| 285 | printk( | 281 | printk( |
| 286 | "%s""bridge: secondary_status: 0x%04x, control: 0x%04x\n", | 282 | "%s""bridge: secondary_status: 0x%04x, control: 0x%04x\n", |
| 287 | pfx, pcie->bridge.secondary_status, pcie->bridge.control); | 283 | pfx, pcie->bridge.secondary_status, pcie->bridge.control); |
| 288 | #ifdef CONFIG_ACPI_APEI_PCIEAER | ||
| 289 | dev = pci_get_domain_bus_and_slot(pcie->device_id.segment, | ||
| 290 | pcie->device_id.bus, pcie->device_id.function); | ||
| 291 | if (!dev) { | ||
| 292 | pr_err("PCI AER Cannot get PCI device %04x:%02x:%02x.%d\n", | ||
| 293 | pcie->device_id.segment, pcie->device_id.bus, | ||
| 294 | pcie->device_id.slot, pcie->device_id.function); | ||
| 295 | return; | ||
| 296 | } | ||
| 297 | if (pcie->validation_bits & CPER_PCIE_VALID_AER_INFO) | ||
| 298 | cper_print_aer(pfx, dev, gdata->error_severity, | ||
| 299 | (struct aer_capability_regs *) pcie->aer_info); | ||
| 300 | pci_dev_put(dev); | ||
| 301 | #endif | ||
| 302 | } | 284 | } |
| 303 | 285 | ||
| 304 | static const char *apei_estatus_section_flag_strs[] = { | 286 | static const char *apei_estatus_section_flag_strs[] = { |
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index d668a8ae602b..403baf4dffc1 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c | |||
| @@ -454,7 +454,9 @@ static void ghes_do_proc(struct ghes *ghes, | |||
| 454 | aer_severity = cper_severity_to_aer(sev); | 454 | aer_severity = cper_severity_to_aer(sev); |
| 455 | aer_recover_queue(pcie_err->device_id.segment, | 455 | aer_recover_queue(pcie_err->device_id.segment, |
| 456 | pcie_err->device_id.bus, | 456 | pcie_err->device_id.bus, |
| 457 | devfn, aer_severity); | 457 | devfn, aer_severity, |
| 458 | (struct aer_capability_regs *) | ||
| 459 | pcie_err->aer_info); | ||
| 458 | } | 460 | } |
| 459 | 461 | ||
| 460 | } | 462 | } |
diff --git a/drivers/clk/clk-si5351.c b/drivers/clk/clk-si5351.c index 892728412e9d..24f553673b72 100644 --- a/drivers/clk/clk-si5351.c +++ b/drivers/clk/clk-si5351.c | |||
| @@ -932,7 +932,7 @@ static unsigned long si5351_clkout_recalc_rate(struct clk_hw *hw, | |||
| 932 | unsigned char reg; | 932 | unsigned char reg; |
| 933 | unsigned char rdiv; | 933 | unsigned char rdiv; |
| 934 | 934 | ||
| 935 | if (hwdata->num > 5) | 935 | if (hwdata->num <= 5) |
| 936 | reg = si5351_msynth_params_address(hwdata->num) + 2; | 936 | reg = si5351_msynth_params_address(hwdata->num) + 2; |
| 937 | else | 937 | else |
| 938 | reg = SI5351_CLK6_7_OUTPUT_DIVIDER; | 938 | reg = SI5351_CLK6_7_OUTPUT_DIVIDER; |
| @@ -1477,6 +1477,16 @@ static int si5351_i2c_probe(struct i2c_client *client, | |||
| 1477 | return -EINVAL; | 1477 | return -EINVAL; |
| 1478 | } | 1478 | } |
| 1479 | drvdata->onecell.clks[n] = clk; | 1479 | drvdata->onecell.clks[n] = clk; |
| 1480 | |||
| 1481 | /* set initial clkout rate */ | ||
| 1482 | if (pdata->clkout[n].rate != 0) { | ||
| 1483 | int ret; | ||
| 1484 | ret = clk_set_rate(clk, pdata->clkout[n].rate); | ||
| 1485 | if (ret != 0) { | ||
| 1486 | dev_err(&client->dev, "Cannot set rate : %d\n", | ||
| 1487 | ret); | ||
| 1488 | } | ||
| 1489 | } | ||
| 1480 | } | 1490 | } |
| 1481 | 1491 | ||
| 1482 | ret = of_clk_add_provider(client->dev.of_node, of_clk_src_onecell_get, | 1492 | ret = of_clk_add_provider(client->dev.of_node, of_clk_src_onecell_get, |
diff --git a/drivers/clk/clk-vt8500.c b/drivers/clk/clk-vt8500.c index debf688afa8e..553ac35bcc91 100644 --- a/drivers/clk/clk-vt8500.c +++ b/drivers/clk/clk-vt8500.c | |||
| @@ -183,7 +183,7 @@ static int vt8500_dclk_set_rate(struct clk_hw *hw, unsigned long rate, | |||
| 183 | writel(divisor, cdev->div_reg); | 183 | writel(divisor, cdev->div_reg); |
| 184 | vt8500_pmc_wait_busy(); | 184 | vt8500_pmc_wait_busy(); |
| 185 | 185 | ||
| 186 | spin_lock_irqsave(cdev->lock, flags); | 186 | spin_unlock_irqrestore(cdev->lock, flags); |
| 187 | 187 | ||
| 188 | return 0; | 188 | return 0; |
| 189 | } | 189 | } |
diff --git a/drivers/clk/mxs/clk-imx28.c b/drivers/clk/mxs/clk-imx28.c index d0e5eed146de..4faf0afc44cd 100644 --- a/drivers/clk/mxs/clk-imx28.c +++ b/drivers/clk/mxs/clk-imx28.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/clk.h> | 12 | #include <linux/clk.h> |
| 13 | #include <linux/clk/mxs.h> | ||
| 13 | #include <linux/clkdev.h> | 14 | #include <linux/clkdev.h> |
| 14 | #include <linux/err.h> | 15 | #include <linux/err.h> |
| 15 | #include <linux/init.h> | 16 | #include <linux/init.h> |
diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk-exynos4.c index d0940e69d034..3c1f88868f29 100644 --- a/drivers/clk/samsung/clk-exynos4.c +++ b/drivers/clk/samsung/clk-exynos4.c | |||
| @@ -791,7 +791,8 @@ struct samsung_gate_clock exynos4210_gate_clks[] __initdata = { | |||
| 791 | GATE(smmu_pcie, "smmu_pcie", "aclk133", GATE_IP_FSYS, 18, 0, 0), | 791 | GATE(smmu_pcie, "smmu_pcie", "aclk133", GATE_IP_FSYS, 18, 0, 0), |
| 792 | GATE(modemif, "modemif", "aclk100", GATE_IP_PERIL, 28, 0, 0), | 792 | GATE(modemif, "modemif", "aclk100", GATE_IP_PERIL, 28, 0, 0), |
| 793 | GATE(chipid, "chipid", "aclk100", E4210_GATE_IP_PERIR, 0, 0, 0), | 793 | GATE(chipid, "chipid", "aclk100", E4210_GATE_IP_PERIR, 0, 0, 0), |
| 794 | GATE(sysreg, "sysreg", "aclk100", E4210_GATE_IP_PERIR, 0, 0, 0), | 794 | GATE(sysreg, "sysreg", "aclk100", E4210_GATE_IP_PERIR, 0, |
| 795 | CLK_IGNORE_UNUSED, 0), | ||
| 795 | GATE(hdmi_cec, "hdmi_cec", "aclk100", E4210_GATE_IP_PERIR, 11, 0, 0), | 796 | GATE(hdmi_cec, "hdmi_cec", "aclk100", E4210_GATE_IP_PERIR, 11, 0, 0), |
| 796 | GATE(smmu_rotator, "smmu_rotator", "aclk200", | 797 | GATE(smmu_rotator, "smmu_rotator", "aclk200", |
| 797 | E4210_GATE_IP_IMAGE, 4, 0, 0), | 798 | E4210_GATE_IP_IMAGE, 4, 0, 0), |
| @@ -819,7 +820,8 @@ struct samsung_gate_clock exynos4x12_gate_clks[] __initdata = { | |||
| 819 | GATE(smmu_mdma, "smmu_mdma", "aclk200", E4X12_GATE_IP_IMAGE, 5, 0, 0), | 820 | GATE(smmu_mdma, "smmu_mdma", "aclk200", E4X12_GATE_IP_IMAGE, 5, 0, 0), |
| 820 | GATE(mipi_hsi, "mipi_hsi", "aclk133", GATE_IP_FSYS, 10, 0, 0), | 821 | GATE(mipi_hsi, "mipi_hsi", "aclk133", GATE_IP_FSYS, 10, 0, 0), |
| 821 | GATE(chipid, "chipid", "aclk100", E4X12_GATE_IP_PERIR, 0, 0, 0), | 822 | GATE(chipid, "chipid", "aclk100", E4X12_GATE_IP_PERIR, 0, 0, 0), |
| 822 | GATE(sysreg, "sysreg", "aclk100", E4X12_GATE_IP_PERIR, 1, 0, 0), | 823 | GATE(sysreg, "sysreg", "aclk100", E4X12_GATE_IP_PERIR, 1, |
| 824 | CLK_IGNORE_UNUSED, 0), | ||
| 823 | GATE(hdmi_cec, "hdmi_cec", "aclk100", E4X12_GATE_IP_PERIR, 11, 0, 0), | 825 | GATE(hdmi_cec, "hdmi_cec", "aclk100", E4X12_GATE_IP_PERIR, 11, 0, 0), |
| 824 | GATE(sclk_mdnie0, "sclk_mdnie0", "div_mdnie0", | 826 | GATE(sclk_mdnie0, "sclk_mdnie0", "div_mdnie0", |
| 825 | SRC_MASK_LCD0, 4, CLK_SET_RATE_PARENT, 0), | 827 | SRC_MASK_LCD0, 4, CLK_SET_RATE_PARENT, 0), |
diff --git a/drivers/clk/ux500/clk-sysctrl.c b/drivers/clk/ux500/clk-sysctrl.c index bc7e9bde792b..e364c9d4aa60 100644 --- a/drivers/clk/ux500/clk-sysctrl.c +++ b/drivers/clk/ux500/clk-sysctrl.c | |||
| @@ -145,7 +145,13 @@ static struct clk *clk_reg_sysctrl(struct device *dev, | |||
| 145 | return ERR_PTR(-ENOMEM); | 145 | return ERR_PTR(-ENOMEM); |
| 146 | } | 146 | } |
| 147 | 147 | ||
| 148 | for (i = 0; i < num_parents; i++) { | 148 | /* set main clock registers */ |
| 149 | clk->reg_sel[0] = reg_sel[0]; | ||
| 150 | clk->reg_bits[0] = reg_bits[0]; | ||
| 151 | clk->reg_mask[0] = reg_mask[0]; | ||
| 152 | |||
| 153 | /* handle clocks with more than one parent */ | ||
| 154 | for (i = 1; i < num_parents; i++) { | ||
| 149 | clk->reg_sel[i] = reg_sel[i]; | 155 | clk->reg_sel[i] = reg_sel[i]; |
| 150 | clk->reg_bits[i] = reg_bits[i]; | 156 | clk->reg_bits[i] = reg_bits[i]; |
| 151 | clk->reg_mask[i] = reg_mask[i]; | 157 | clk->reg_mask[i] = reg_mask[i]; |
diff --git a/drivers/clk/ux500/u8500_clk.c b/drivers/clk/ux500/u8500_clk.c index 0b4f35a5ffc2..80069c370a47 100644 --- a/drivers/clk/ux500/u8500_clk.c +++ b/drivers/clk/ux500/u8500_clk.c | |||
| @@ -325,7 +325,7 @@ void u8500_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base, | |||
| 325 | clk = clk_reg_prcc_pclk("p3_pclk0", "per3clk", clkrst3_base, | 325 | clk = clk_reg_prcc_pclk("p3_pclk0", "per3clk", clkrst3_base, |
| 326 | BIT(0), 0); | 326 | BIT(0), 0); |
| 327 | clk_register_clkdev(clk, "fsmc", NULL); | 327 | clk_register_clkdev(clk, "fsmc", NULL); |
| 328 | clk_register_clkdev(clk, NULL, "smsc911x"); | 328 | clk_register_clkdev(clk, NULL, "smsc911x.0"); |
| 329 | 329 | ||
| 330 | clk = clk_reg_prcc_pclk("p3_pclk1", "per3clk", clkrst3_base, | 330 | clk = clk_reg_prcc_pclk("p3_pclk1", "per3clk", clkrst3_base, |
| 331 | BIT(1), 0); | 331 | BIT(1), 0); |
diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c index 765fdf5ce579..bf416a8391a7 100644 --- a/drivers/crypto/caam/caamalg.c +++ b/drivers/crypto/caam/caamalg.c | |||
| @@ -1154,7 +1154,7 @@ static struct aead_edesc *aead_edesc_alloc(struct aead_request *req, | |||
| 1154 | dst_nents = sg_count(req->dst, req->cryptlen, &dst_chained); | 1154 | dst_nents = sg_count(req->dst, req->cryptlen, &dst_chained); |
| 1155 | 1155 | ||
| 1156 | sgc = dma_map_sg_chained(jrdev, req->assoc, assoc_nents ? : 1, | 1156 | sgc = dma_map_sg_chained(jrdev, req->assoc, assoc_nents ? : 1, |
| 1157 | DMA_BIDIRECTIONAL, assoc_chained); | 1157 | DMA_TO_DEVICE, assoc_chained); |
| 1158 | if (likely(req->src == req->dst)) { | 1158 | if (likely(req->src == req->dst)) { |
| 1159 | sgc = dma_map_sg_chained(jrdev, req->src, src_nents ? : 1, | 1159 | sgc = dma_map_sg_chained(jrdev, req->src, src_nents ? : 1, |
| 1160 | DMA_BIDIRECTIONAL, src_chained); | 1160 | DMA_BIDIRECTIONAL, src_chained); |
| @@ -1336,7 +1336,7 @@ static struct aead_edesc *aead_giv_edesc_alloc(struct aead_givcrypt_request | |||
| 1336 | dst_nents = sg_count(req->dst, req->cryptlen, &dst_chained); | 1336 | dst_nents = sg_count(req->dst, req->cryptlen, &dst_chained); |
| 1337 | 1337 | ||
| 1338 | sgc = dma_map_sg_chained(jrdev, req->assoc, assoc_nents ? : 1, | 1338 | sgc = dma_map_sg_chained(jrdev, req->assoc, assoc_nents ? : 1, |
| 1339 | DMA_BIDIRECTIONAL, assoc_chained); | 1339 | DMA_TO_DEVICE, assoc_chained); |
| 1340 | if (likely(req->src == req->dst)) { | 1340 | if (likely(req->src == req->dst)) { |
| 1341 | sgc = dma_map_sg_chained(jrdev, req->src, src_nents ? : 1, | 1341 | sgc = dma_map_sg_chained(jrdev, req->src, src_nents ? : 1, |
| 1342 | DMA_BIDIRECTIONAL, src_chained); | 1342 | DMA_BIDIRECTIONAL, src_chained); |
diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c index b623c599e572..8bd1bb6dbe47 100644 --- a/drivers/firmware/efi/efivars.c +++ b/drivers/firmware/efi/efivars.c | |||
| @@ -523,13 +523,11 @@ static void efivar_update_sysfs_entries(struct work_struct *work) | |||
| 523 | struct efivar_entry *entry; | 523 | struct efivar_entry *entry; |
| 524 | int err; | 524 | int err; |
| 525 | 525 | ||
| 526 | entry = kzalloc(sizeof(*entry), GFP_KERNEL); | ||
| 527 | if (!entry) | ||
| 528 | return; | ||
| 529 | |||
| 530 | /* Add new sysfs entries */ | 526 | /* Add new sysfs entries */ |
| 531 | while (1) { | 527 | while (1) { |
| 532 | memset(entry, 0, sizeof(*entry)); | 528 | entry = kzalloc(sizeof(*entry), GFP_KERNEL); |
| 529 | if (!entry) | ||
| 530 | return; | ||
| 533 | 531 | ||
| 534 | err = efivar_init(efivar_update_sysfs_entry, entry, | 532 | err = efivar_init(efivar_update_sysfs_entry, entry, |
| 535 | true, false, &efivar_sysfs_list); | 533 | true, false, &efivar_sysfs_list); |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c index e8894bc9e6d5..c200e4d71e3d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c | |||
| @@ -48,6 +48,8 @@ struct exynos_drm_crtc { | |||
| 48 | unsigned int pipe; | 48 | unsigned int pipe; |
| 49 | unsigned int dpms; | 49 | unsigned int dpms; |
| 50 | enum exynos_crtc_mode mode; | 50 | enum exynos_crtc_mode mode; |
| 51 | wait_queue_head_t pending_flip_queue; | ||
| 52 | atomic_t pending_flip; | ||
| 51 | }; | 53 | }; |
| 52 | 54 | ||
| 53 | static void exynos_drm_crtc_dpms(struct drm_crtc *crtc, int mode) | 55 | static void exynos_drm_crtc_dpms(struct drm_crtc *crtc, int mode) |
| @@ -61,6 +63,13 @@ static void exynos_drm_crtc_dpms(struct drm_crtc *crtc, int mode) | |||
| 61 | return; | 63 | return; |
| 62 | } | 64 | } |
| 63 | 65 | ||
| 66 | if (mode > DRM_MODE_DPMS_ON) { | ||
| 67 | /* wait for the completion of page flip. */ | ||
| 68 | wait_event(exynos_crtc->pending_flip_queue, | ||
| 69 | atomic_read(&exynos_crtc->pending_flip) == 0); | ||
| 70 | drm_vblank_off(crtc->dev, exynos_crtc->pipe); | ||
| 71 | } | ||
| 72 | |||
| 64 | exynos_drm_fn_encoder(crtc, &mode, exynos_drm_encoder_crtc_dpms); | 73 | exynos_drm_fn_encoder(crtc, &mode, exynos_drm_encoder_crtc_dpms); |
| 65 | exynos_crtc->dpms = mode; | 74 | exynos_crtc->dpms = mode; |
| 66 | } | 75 | } |
| @@ -217,7 +226,6 @@ static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc, | |||
| 217 | ret = drm_vblank_get(dev, exynos_crtc->pipe); | 226 | ret = drm_vblank_get(dev, exynos_crtc->pipe); |
| 218 | if (ret) { | 227 | if (ret) { |
| 219 | DRM_DEBUG("failed to acquire vblank counter\n"); | 228 | DRM_DEBUG("failed to acquire vblank counter\n"); |
| 220 | list_del(&event->base.link); | ||
| 221 | 229 | ||
| 222 | goto out; | 230 | goto out; |
| 223 | } | 231 | } |
| @@ -225,6 +233,7 @@ static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc, | |||
| 225 | spin_lock_irq(&dev->event_lock); | 233 | spin_lock_irq(&dev->event_lock); |
| 226 | list_add_tail(&event->base.link, | 234 | list_add_tail(&event->base.link, |
| 227 | &dev_priv->pageflip_event_list); | 235 | &dev_priv->pageflip_event_list); |
| 236 | atomic_set(&exynos_crtc->pending_flip, 1); | ||
| 228 | spin_unlock_irq(&dev->event_lock); | 237 | spin_unlock_irq(&dev->event_lock); |
| 229 | 238 | ||
| 230 | crtc->fb = fb; | 239 | crtc->fb = fb; |
| @@ -344,6 +353,8 @@ int exynos_drm_crtc_create(struct drm_device *dev, unsigned int nr) | |||
| 344 | 353 | ||
| 345 | exynos_crtc->pipe = nr; | 354 | exynos_crtc->pipe = nr; |
| 346 | exynos_crtc->dpms = DRM_MODE_DPMS_OFF; | 355 | exynos_crtc->dpms = DRM_MODE_DPMS_OFF; |
| 356 | init_waitqueue_head(&exynos_crtc->pending_flip_queue); | ||
| 357 | atomic_set(&exynos_crtc->pending_flip, 0); | ||
| 347 | exynos_crtc->plane = exynos_plane_init(dev, 1 << nr, true); | 358 | exynos_crtc->plane = exynos_plane_init(dev, 1 << nr, true); |
| 348 | if (!exynos_crtc->plane) { | 359 | if (!exynos_crtc->plane) { |
| 349 | kfree(exynos_crtc); | 360 | kfree(exynos_crtc); |
| @@ -398,7 +409,8 @@ void exynos_drm_crtc_finish_pageflip(struct drm_device *dev, int crtc) | |||
| 398 | { | 409 | { |
| 399 | struct exynos_drm_private *dev_priv = dev->dev_private; | 410 | struct exynos_drm_private *dev_priv = dev->dev_private; |
| 400 | struct drm_pending_vblank_event *e, *t; | 411 | struct drm_pending_vblank_event *e, *t; |
| 401 | struct timeval now; | 412 | struct drm_crtc *drm_crtc = dev_priv->crtc[crtc]; |
| 413 | struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(drm_crtc); | ||
| 402 | unsigned long flags; | 414 | unsigned long flags; |
| 403 | 415 | ||
| 404 | DRM_DEBUG_KMS("%s\n", __FILE__); | 416 | DRM_DEBUG_KMS("%s\n", __FILE__); |
| @@ -411,14 +423,11 @@ void exynos_drm_crtc_finish_pageflip(struct drm_device *dev, int crtc) | |||
| 411 | if (crtc != e->pipe) | 423 | if (crtc != e->pipe) |
| 412 | continue; | 424 | continue; |
| 413 | 425 | ||
| 414 | do_gettimeofday(&now); | 426 | list_del(&e->base.link); |
| 415 | e->event.sequence = 0; | 427 | drm_send_vblank_event(dev, -1, e); |
| 416 | e->event.tv_sec = now.tv_sec; | ||
| 417 | e->event.tv_usec = now.tv_usec; | ||
| 418 | |||
| 419 | list_move_tail(&e->base.link, &e->base.file_priv->event_list); | ||
| 420 | wake_up_interruptible(&e->base.file_priv->event_wait); | ||
| 421 | drm_vblank_put(dev, crtc); | 428 | drm_vblank_put(dev, crtc); |
| 429 | atomic_set(&exynos_crtc->pending_flip, 0); | ||
| 430 | wake_up(&exynos_crtc->pending_flip_queue); | ||
| 422 | } | 431 | } |
| 423 | 432 | ||
| 424 | spin_unlock_irqrestore(&dev->event_lock, flags); | 433 | spin_unlock_irqrestore(&dev->event_lock, flags); |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c index 68f0045f86b8..8f007aaeffc3 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c | |||
| @@ -182,7 +182,7 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper, | |||
| 182 | 182 | ||
| 183 | helper->fb = exynos_drm_framebuffer_init(dev, &mode_cmd, | 183 | helper->fb = exynos_drm_framebuffer_init(dev, &mode_cmd, |
| 184 | &exynos_gem_obj->base); | 184 | &exynos_gem_obj->base); |
| 185 | if (IS_ERR_OR_NULL(helper->fb)) { | 185 | if (IS_ERR(helper->fb)) { |
| 186 | DRM_ERROR("failed to create drm framebuffer.\n"); | 186 | DRM_ERROR("failed to create drm framebuffer.\n"); |
| 187 | ret = PTR_ERR(helper->fb); | 187 | ret = PTR_ERR(helper->fb); |
| 188 | goto err_destroy_gem; | 188 | goto err_destroy_gem; |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimc.c b/drivers/gpu/drm/exynos/exynos_drm_fimc.c index 773f583fa964..4a1616a18ab7 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimc.c | |||
| @@ -12,9 +12,9 @@ | |||
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/mfd/syscon.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| 17 | #include <linux/mfd/syscon.h> | ||
| 18 | #include <linux/regmap.h> | 18 | #include <linux/regmap.h> |
| 19 | #include <linux/clk.h> | 19 | #include <linux/clk.h> |
| 20 | #include <linux/pm_runtime.h> | 20 | #include <linux/pm_runtime.h> |
| @@ -1845,7 +1845,7 @@ static int fimc_probe(struct platform_device *pdev) | |||
| 1845 | } | 1845 | } |
| 1846 | 1846 | ||
| 1847 | ctx->irq = res->start; | 1847 | ctx->irq = res->start; |
| 1848 | ret = request_threaded_irq(ctx->irq, NULL, fimc_irq_handler, | 1848 | ret = devm_request_threaded_irq(dev, ctx->irq, NULL, fimc_irq_handler, |
| 1849 | IRQF_ONESHOT, "drm_fimc", ctx); | 1849 | IRQF_ONESHOT, "drm_fimc", ctx); |
| 1850 | if (ret < 0) { | 1850 | if (ret < 0) { |
| 1851 | dev_err(dev, "failed to request irq.\n"); | 1851 | dev_err(dev, "failed to request irq.\n"); |
| @@ -1854,7 +1854,7 @@ static int fimc_probe(struct platform_device *pdev) | |||
| 1854 | 1854 | ||
| 1855 | ret = fimc_setup_clocks(ctx); | 1855 | ret = fimc_setup_clocks(ctx); |
| 1856 | if (ret < 0) | 1856 | if (ret < 0) |
| 1857 | goto err_free_irq; | 1857 | return ret; |
| 1858 | 1858 | ||
| 1859 | ippdrv = &ctx->ippdrv; | 1859 | ippdrv = &ctx->ippdrv; |
| 1860 | ippdrv->ops[EXYNOS_DRM_OPS_SRC] = &fimc_src_ops; | 1860 | ippdrv->ops[EXYNOS_DRM_OPS_SRC] = &fimc_src_ops; |
| @@ -1884,7 +1884,7 @@ static int fimc_probe(struct platform_device *pdev) | |||
| 1884 | goto err_pm_dis; | 1884 | goto err_pm_dis; |
| 1885 | } | 1885 | } |
| 1886 | 1886 | ||
| 1887 | dev_info(&pdev->dev, "drm fimc registered successfully.\n"); | 1887 | dev_info(dev, "drm fimc registered successfully.\n"); |
| 1888 | 1888 | ||
| 1889 | return 0; | 1889 | return 0; |
| 1890 | 1890 | ||
| @@ -1892,8 +1892,6 @@ err_pm_dis: | |||
| 1892 | pm_runtime_disable(dev); | 1892 | pm_runtime_disable(dev); |
| 1893 | err_put_clk: | 1893 | err_put_clk: |
| 1894 | fimc_put_clocks(ctx); | 1894 | fimc_put_clocks(ctx); |
| 1895 | err_free_irq: | ||
| 1896 | free_irq(ctx->irq, ctx); | ||
| 1897 | 1895 | ||
| 1898 | return ret; | 1896 | return ret; |
| 1899 | } | 1897 | } |
| @@ -1911,8 +1909,6 @@ static int fimc_remove(struct platform_device *pdev) | |||
| 1911 | pm_runtime_set_suspended(dev); | 1909 | pm_runtime_set_suspended(dev); |
| 1912 | pm_runtime_disable(dev); | 1910 | pm_runtime_disable(dev); |
| 1913 | 1911 | ||
| 1914 | free_irq(ctx->irq, ctx); | ||
| 1915 | |||
| 1916 | return 0; | 1912 | return 0; |
| 1917 | } | 1913 | } |
| 1918 | 1914 | ||
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 746b282b343a..97c61dbffd82 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c | |||
| @@ -885,7 +885,7 @@ static int fimd_probe(struct platform_device *pdev) | |||
| 885 | 885 | ||
| 886 | DRM_DEBUG_KMS("%s\n", __FILE__); | 886 | DRM_DEBUG_KMS("%s\n", __FILE__); |
| 887 | 887 | ||
| 888 | if (pdev->dev.of_node) { | 888 | if (dev->of_node) { |
| 889 | pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); | 889 | pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); |
| 890 | if (!pdata) { | 890 | if (!pdata) { |
| 891 | DRM_ERROR("memory allocation for pdata failed\n"); | 891 | DRM_ERROR("memory allocation for pdata failed\n"); |
| @@ -899,7 +899,7 @@ static int fimd_probe(struct platform_device *pdev) | |||
| 899 | return ret; | 899 | return ret; |
| 900 | } | 900 | } |
| 901 | } else { | 901 | } else { |
| 902 | pdata = pdev->dev.platform_data; | 902 | pdata = dev->platform_data; |
| 903 | if (!pdata) { | 903 | if (!pdata) { |
| 904 | DRM_ERROR("no platform data specified\n"); | 904 | DRM_ERROR("no platform data specified\n"); |
| 905 | return -EINVAL; | 905 | return -EINVAL; |
| @@ -912,7 +912,7 @@ static int fimd_probe(struct platform_device *pdev) | |||
| 912 | return -EINVAL; | 912 | return -EINVAL; |
| 913 | } | 913 | } |
| 914 | 914 | ||
| 915 | ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL); | 915 | ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL); |
| 916 | if (!ctx) | 916 | if (!ctx) |
| 917 | return -ENOMEM; | 917 | return -ENOMEM; |
| 918 | 918 | ||
| @@ -930,7 +930,7 @@ static int fimd_probe(struct platform_device *pdev) | |||
| 930 | 930 | ||
| 931 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 931 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 932 | 932 | ||
| 933 | ctx->regs = devm_ioremap_resource(&pdev->dev, res); | 933 | ctx->regs = devm_ioremap_resource(dev, res); |
| 934 | if (IS_ERR(ctx->regs)) | 934 | if (IS_ERR(ctx->regs)) |
| 935 | return PTR_ERR(ctx->regs); | 935 | return PTR_ERR(ctx->regs); |
| 936 | 936 | ||
| @@ -942,7 +942,7 @@ static int fimd_probe(struct platform_device *pdev) | |||
| 942 | 942 | ||
| 943 | ctx->irq = res->start; | 943 | ctx->irq = res->start; |
| 944 | 944 | ||
| 945 | ret = devm_request_irq(&pdev->dev, ctx->irq, fimd_irq_handler, | 945 | ret = devm_request_irq(dev, ctx->irq, fimd_irq_handler, |
| 946 | 0, "drm_fimd", ctx); | 946 | 0, "drm_fimd", ctx); |
| 947 | if (ret) { | 947 | if (ret) { |
| 948 | dev_err(dev, "irq request failed.\n"); | 948 | dev_err(dev, "irq request failed.\n"); |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c index 47a493c8a71f..af75434ee4d7 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c +++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c | |||
| @@ -1379,7 +1379,7 @@ static int g2d_probe(struct platform_device *pdev) | |||
| 1379 | struct exynos_drm_subdrv *subdrv; | 1379 | struct exynos_drm_subdrv *subdrv; |
| 1380 | int ret; | 1380 | int ret; |
| 1381 | 1381 | ||
| 1382 | g2d = devm_kzalloc(&pdev->dev, sizeof(*g2d), GFP_KERNEL); | 1382 | g2d = devm_kzalloc(dev, sizeof(*g2d), GFP_KERNEL); |
| 1383 | if (!g2d) { | 1383 | if (!g2d) { |
| 1384 | dev_err(dev, "failed to allocate driver data\n"); | 1384 | dev_err(dev, "failed to allocate driver data\n"); |
| 1385 | return -ENOMEM; | 1385 | return -ENOMEM; |
| @@ -1417,7 +1417,7 @@ static int g2d_probe(struct platform_device *pdev) | |||
| 1417 | 1417 | ||
| 1418 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 1418 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 1419 | 1419 | ||
| 1420 | g2d->regs = devm_ioremap_resource(&pdev->dev, res); | 1420 | g2d->regs = devm_ioremap_resource(dev, res); |
| 1421 | if (IS_ERR(g2d->regs)) { | 1421 | if (IS_ERR(g2d->regs)) { |
| 1422 | ret = PTR_ERR(g2d->regs); | 1422 | ret = PTR_ERR(g2d->regs); |
| 1423 | goto err_put_clk; | 1423 | goto err_put_clk; |
| @@ -1430,7 +1430,7 @@ static int g2d_probe(struct platform_device *pdev) | |||
| 1430 | goto err_put_clk; | 1430 | goto err_put_clk; |
| 1431 | } | 1431 | } |
| 1432 | 1432 | ||
| 1433 | ret = devm_request_irq(&pdev->dev, g2d->irq, g2d_irq_handler, 0, | 1433 | ret = devm_request_irq(dev, g2d->irq, g2d_irq_handler, 0, |
| 1434 | "drm_g2d", g2d); | 1434 | "drm_g2d", g2d); |
| 1435 | if (ret < 0) { | 1435 | if (ret < 0) { |
| 1436 | dev_err(dev, "irq request failed\n"); | 1436 | dev_err(dev, "irq request failed\n"); |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c index 7841c3b8a20e..762f40d548b7 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c | |||
| @@ -1704,7 +1704,7 @@ static int gsc_probe(struct platform_device *pdev) | |||
| 1704 | } | 1704 | } |
| 1705 | 1705 | ||
| 1706 | ctx->irq = res->start; | 1706 | ctx->irq = res->start; |
| 1707 | ret = request_threaded_irq(ctx->irq, NULL, gsc_irq_handler, | 1707 | ret = devm_request_threaded_irq(dev, ctx->irq, NULL, gsc_irq_handler, |
| 1708 | IRQF_ONESHOT, "drm_gsc", ctx); | 1708 | IRQF_ONESHOT, "drm_gsc", ctx); |
| 1709 | if (ret < 0) { | 1709 | if (ret < 0) { |
| 1710 | dev_err(dev, "failed to request irq.\n"); | 1710 | dev_err(dev, "failed to request irq.\n"); |
| @@ -1725,7 +1725,7 @@ static int gsc_probe(struct platform_device *pdev) | |||
| 1725 | ret = gsc_init_prop_list(ippdrv); | 1725 | ret = gsc_init_prop_list(ippdrv); |
| 1726 | if (ret < 0) { | 1726 | if (ret < 0) { |
| 1727 | dev_err(dev, "failed to init property list.\n"); | 1727 | dev_err(dev, "failed to init property list.\n"); |
| 1728 | goto err_get_irq; | 1728 | return ret; |
| 1729 | } | 1729 | } |
| 1730 | 1730 | ||
| 1731 | DRM_DEBUG_KMS("%s:id[%d]ippdrv[0x%x]\n", __func__, ctx->id, | 1731 | DRM_DEBUG_KMS("%s:id[%d]ippdrv[0x%x]\n", __func__, ctx->id, |
| @@ -1743,15 +1743,12 @@ static int gsc_probe(struct platform_device *pdev) | |||
| 1743 | goto err_ippdrv_register; | 1743 | goto err_ippdrv_register; |
| 1744 | } | 1744 | } |
| 1745 | 1745 | ||
| 1746 | dev_info(&pdev->dev, "drm gsc registered successfully.\n"); | 1746 | dev_info(dev, "drm gsc registered successfully.\n"); |
| 1747 | 1747 | ||
| 1748 | return 0; | 1748 | return 0; |
| 1749 | 1749 | ||
| 1750 | err_ippdrv_register: | 1750 | err_ippdrv_register: |
| 1751 | devm_kfree(dev, ippdrv->prop_list); | ||
| 1752 | pm_runtime_disable(dev); | 1751 | pm_runtime_disable(dev); |
| 1753 | err_get_irq: | ||
| 1754 | free_irq(ctx->irq, ctx); | ||
| 1755 | return ret; | 1752 | return ret; |
| 1756 | } | 1753 | } |
| 1757 | 1754 | ||
| @@ -1761,15 +1758,12 @@ static int gsc_remove(struct platform_device *pdev) | |||
| 1761 | struct gsc_context *ctx = get_gsc_context(dev); | 1758 | struct gsc_context *ctx = get_gsc_context(dev); |
| 1762 | struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; | 1759 | struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; |
| 1763 | 1760 | ||
| 1764 | devm_kfree(dev, ippdrv->prop_list); | ||
| 1765 | exynos_drm_ippdrv_unregister(ippdrv); | 1761 | exynos_drm_ippdrv_unregister(ippdrv); |
| 1766 | mutex_destroy(&ctx->lock); | 1762 | mutex_destroy(&ctx->lock); |
| 1767 | 1763 | ||
| 1768 | pm_runtime_set_suspended(dev); | 1764 | pm_runtime_set_suspended(dev); |
| 1769 | pm_runtime_disable(dev); | 1765 | pm_runtime_disable(dev); |
| 1770 | 1766 | ||
| 1771 | free_irq(ctx->irq, ctx); | ||
| 1772 | |||
| 1773 | return 0; | 1767 | return 0; |
| 1774 | } | 1768 | } |
| 1775 | 1769 | ||
diff --git a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c index ba2f0f1aa05f..437fb947e46d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c | |||
| @@ -442,7 +442,7 @@ static int exynos_drm_hdmi_probe(struct platform_device *pdev) | |||
| 442 | 442 | ||
| 443 | DRM_DEBUG_KMS("%s\n", __FILE__); | 443 | DRM_DEBUG_KMS("%s\n", __FILE__); |
| 444 | 444 | ||
| 445 | ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL); | 445 | ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL); |
| 446 | if (!ctx) { | 446 | if (!ctx) { |
| 447 | DRM_LOG_KMS("failed to alloc common hdmi context.\n"); | 447 | DRM_LOG_KMS("failed to alloc common hdmi context.\n"); |
| 448 | return -ENOMEM; | 448 | return -ENOMEM; |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c index 29d2ad314490..be1e88463466 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c +++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c | |||
| @@ -222,7 +222,7 @@ static struct exynos_drm_ippdrv *ipp_find_driver(struct ipp_context *ctx, | |||
| 222 | /* find ipp driver using idr */ | 222 | /* find ipp driver using idr */ |
| 223 | ippdrv = ipp_find_obj(&ctx->ipp_idr, &ctx->ipp_lock, | 223 | ippdrv = ipp_find_obj(&ctx->ipp_idr, &ctx->ipp_lock, |
| 224 | ipp_id); | 224 | ipp_id); |
| 225 | if (IS_ERR_OR_NULL(ippdrv)) { | 225 | if (IS_ERR(ippdrv)) { |
| 226 | DRM_ERROR("not found ipp%d driver.\n", ipp_id); | 226 | DRM_ERROR("not found ipp%d driver.\n", ipp_id); |
| 227 | return ippdrv; | 227 | return ippdrv; |
| 228 | } | 228 | } |
| @@ -388,7 +388,7 @@ static int ipp_find_and_set_property(struct drm_exynos_ipp_property *property) | |||
| 388 | DRM_DEBUG_KMS("%s:prop_id[%d]\n", __func__, prop_id); | 388 | DRM_DEBUG_KMS("%s:prop_id[%d]\n", __func__, prop_id); |
| 389 | 389 | ||
| 390 | ippdrv = ipp_find_drv_by_handle(prop_id); | 390 | ippdrv = ipp_find_drv_by_handle(prop_id); |
| 391 | if (IS_ERR_OR_NULL(ippdrv)) { | 391 | if (IS_ERR(ippdrv)) { |
| 392 | DRM_ERROR("failed to get ipp driver.\n"); | 392 | DRM_ERROR("failed to get ipp driver.\n"); |
| 393 | return -EINVAL; | 393 | return -EINVAL; |
| 394 | } | 394 | } |
| @@ -492,7 +492,7 @@ int exynos_drm_ipp_set_property(struct drm_device *drm_dev, void *data, | |||
| 492 | 492 | ||
| 493 | /* find ipp driver using ipp id */ | 493 | /* find ipp driver using ipp id */ |
| 494 | ippdrv = ipp_find_driver(ctx, property); | 494 | ippdrv = ipp_find_driver(ctx, property); |
| 495 | if (IS_ERR_OR_NULL(ippdrv)) { | 495 | if (IS_ERR(ippdrv)) { |
| 496 | DRM_ERROR("failed to get ipp driver.\n"); | 496 | DRM_ERROR("failed to get ipp driver.\n"); |
| 497 | return -EINVAL; | 497 | return -EINVAL; |
| 498 | } | 498 | } |
| @@ -521,19 +521,19 @@ int exynos_drm_ipp_set_property(struct drm_device *drm_dev, void *data, | |||
| 521 | c_node->state = IPP_STATE_IDLE; | 521 | c_node->state = IPP_STATE_IDLE; |
| 522 | 522 | ||
| 523 | c_node->start_work = ipp_create_cmd_work(); | 523 | c_node->start_work = ipp_create_cmd_work(); |
| 524 | if (IS_ERR_OR_NULL(c_node->start_work)) { | 524 | if (IS_ERR(c_node->start_work)) { |
| 525 | DRM_ERROR("failed to create start work.\n"); | 525 | DRM_ERROR("failed to create start work.\n"); |
| 526 | goto err_clear; | 526 | goto err_clear; |
| 527 | } | 527 | } |
| 528 | 528 | ||
| 529 | c_node->stop_work = ipp_create_cmd_work(); | 529 | c_node->stop_work = ipp_create_cmd_work(); |
| 530 | if (IS_ERR_OR_NULL(c_node->stop_work)) { | 530 | if (IS_ERR(c_node->stop_work)) { |
| 531 | DRM_ERROR("failed to create stop work.\n"); | 531 | DRM_ERROR("failed to create stop work.\n"); |
| 532 | goto err_free_start; | 532 | goto err_free_start; |
| 533 | } | 533 | } |
| 534 | 534 | ||
| 535 | c_node->event_work = ipp_create_event_work(); | 535 | c_node->event_work = ipp_create_event_work(); |
| 536 | if (IS_ERR_OR_NULL(c_node->event_work)) { | 536 | if (IS_ERR(c_node->event_work)) { |
| 537 | DRM_ERROR("failed to create event work.\n"); | 537 | DRM_ERROR("failed to create event work.\n"); |
| 538 | goto err_free_stop; | 538 | goto err_free_stop; |
| 539 | } | 539 | } |
| @@ -915,7 +915,7 @@ static int ipp_queue_buf_with_run(struct device *dev, | |||
| 915 | DRM_DEBUG_KMS("%s\n", __func__); | 915 | DRM_DEBUG_KMS("%s\n", __func__); |
| 916 | 916 | ||
| 917 | ippdrv = ipp_find_drv_by_handle(qbuf->prop_id); | 917 | ippdrv = ipp_find_drv_by_handle(qbuf->prop_id); |
| 918 | if (IS_ERR_OR_NULL(ippdrv)) { | 918 | if (IS_ERR(ippdrv)) { |
| 919 | DRM_ERROR("failed to get ipp driver.\n"); | 919 | DRM_ERROR("failed to get ipp driver.\n"); |
| 920 | return -EFAULT; | 920 | return -EFAULT; |
| 921 | } | 921 | } |
| @@ -1909,7 +1909,7 @@ static int ipp_probe(struct platform_device *pdev) | |||
| 1909 | struct exynos_drm_subdrv *subdrv; | 1909 | struct exynos_drm_subdrv *subdrv; |
| 1910 | int ret; | 1910 | int ret; |
| 1911 | 1911 | ||
| 1912 | ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL); | 1912 | ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL); |
| 1913 | if (!ctx) | 1913 | if (!ctx) |
| 1914 | return -ENOMEM; | 1914 | return -ENOMEM; |
| 1915 | 1915 | ||
| @@ -1963,7 +1963,7 @@ static int ipp_probe(struct platform_device *pdev) | |||
| 1963 | goto err_cmd_workq; | 1963 | goto err_cmd_workq; |
| 1964 | } | 1964 | } |
| 1965 | 1965 | ||
| 1966 | dev_info(&pdev->dev, "drm ipp registered successfully.\n"); | 1966 | dev_info(dev, "drm ipp registered successfully.\n"); |
| 1967 | 1967 | ||
| 1968 | return 0; | 1968 | return 0; |
| 1969 | 1969 | ||
diff --git a/drivers/gpu/drm/exynos/exynos_drm_rotator.c b/drivers/gpu/drm/exynos/exynos_drm_rotator.c index 947f09f15ad1..9b6c70964d71 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_rotator.c +++ b/drivers/gpu/drm/exynos/exynos_drm_rotator.c | |||
| @@ -666,8 +666,8 @@ static int rotator_probe(struct platform_device *pdev) | |||
| 666 | return rot->irq; | 666 | return rot->irq; |
| 667 | } | 667 | } |
| 668 | 668 | ||
| 669 | ret = request_threaded_irq(rot->irq, NULL, rotator_irq_handler, | 669 | ret = devm_request_threaded_irq(dev, rot->irq, NULL, |
| 670 | IRQF_ONESHOT, "drm_rotator", rot); | 670 | rotator_irq_handler, IRQF_ONESHOT, "drm_rotator", rot); |
| 671 | if (ret < 0) { | 671 | if (ret < 0) { |
| 672 | dev_err(dev, "failed to request irq\n"); | 672 | dev_err(dev, "failed to request irq\n"); |
| 673 | return ret; | 673 | return ret; |
| @@ -676,8 +676,7 @@ static int rotator_probe(struct platform_device *pdev) | |||
| 676 | rot->clock = devm_clk_get(dev, "rotator"); | 676 | rot->clock = devm_clk_get(dev, "rotator"); |
| 677 | if (IS_ERR(rot->clock)) { | 677 | if (IS_ERR(rot->clock)) { |
| 678 | dev_err(dev, "failed to get clock\n"); | 678 | dev_err(dev, "failed to get clock\n"); |
| 679 | ret = PTR_ERR(rot->clock); | 679 | return PTR_ERR(rot->clock); |
| 680 | goto err_clk_get; | ||
| 681 | } | 680 | } |
| 682 | 681 | ||
| 683 | pm_runtime_enable(dev); | 682 | pm_runtime_enable(dev); |
| @@ -709,10 +708,7 @@ static int rotator_probe(struct platform_device *pdev) | |||
| 709 | return 0; | 708 | return 0; |
| 710 | 709 | ||
| 711 | err_ippdrv_register: | 710 | err_ippdrv_register: |
| 712 | devm_kfree(dev, ippdrv->prop_list); | ||
| 713 | pm_runtime_disable(dev); | 711 | pm_runtime_disable(dev); |
| 714 | err_clk_get: | ||
| 715 | free_irq(rot->irq, rot); | ||
| 716 | return ret; | 712 | return ret; |
| 717 | } | 713 | } |
| 718 | 714 | ||
| @@ -722,13 +718,10 @@ static int rotator_remove(struct platform_device *pdev) | |||
| 722 | struct rot_context *rot = dev_get_drvdata(dev); | 718 | struct rot_context *rot = dev_get_drvdata(dev); |
| 723 | struct exynos_drm_ippdrv *ippdrv = &rot->ippdrv; | 719 | struct exynos_drm_ippdrv *ippdrv = &rot->ippdrv; |
| 724 | 720 | ||
| 725 | devm_kfree(dev, ippdrv->prop_list); | ||
| 726 | exynos_drm_ippdrv_unregister(ippdrv); | 721 | exynos_drm_ippdrv_unregister(ippdrv); |
| 727 | 722 | ||
| 728 | pm_runtime_disable(dev); | 723 | pm_runtime_disable(dev); |
| 729 | 724 | ||
| 730 | free_irq(rot->irq, rot); | ||
| 731 | |||
| 732 | return 0; | 725 | return 0; |
| 733 | } | 726 | } |
| 734 | 727 | ||
diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c index 9504b0cd825a..24376c194a5e 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c | |||
| @@ -594,7 +594,7 @@ static int vidi_probe(struct platform_device *pdev) | |||
| 594 | 594 | ||
| 595 | DRM_DEBUG_KMS("%s\n", __FILE__); | 595 | DRM_DEBUG_KMS("%s\n", __FILE__); |
| 596 | 596 | ||
| 597 | ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL); | 597 | ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL); |
| 598 | if (!ctx) | 598 | if (!ctx) |
| 599 | return -ENOMEM; | 599 | return -ENOMEM; |
| 600 | 600 | ||
| @@ -612,7 +612,7 @@ static int vidi_probe(struct platform_device *pdev) | |||
| 612 | 612 | ||
| 613 | platform_set_drvdata(pdev, ctx); | 613 | platform_set_drvdata(pdev, ctx); |
| 614 | 614 | ||
| 615 | ret = device_create_file(&pdev->dev, &dev_attr_connection); | 615 | ret = device_create_file(dev, &dev_attr_connection); |
| 616 | if (ret < 0) | 616 | if (ret < 0) |
| 617 | DRM_INFO("failed to create connection sysfs.\n"); | 617 | DRM_INFO("failed to create connection sysfs.\n"); |
| 618 | 618 | ||
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 6652597586a1..fd1426dca882 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c | |||
| @@ -1946,14 +1946,14 @@ static int hdmi_probe(struct platform_device *pdev) | |||
| 1946 | 1946 | ||
| 1947 | DRM_DEBUG_KMS("[%d]\n", __LINE__); | 1947 | DRM_DEBUG_KMS("[%d]\n", __LINE__); |
| 1948 | 1948 | ||
| 1949 | if (pdev->dev.of_node) { | 1949 | if (dev->of_node) { |
| 1950 | pdata = drm_hdmi_dt_parse_pdata(dev); | 1950 | pdata = drm_hdmi_dt_parse_pdata(dev); |
| 1951 | if (IS_ERR(pdata)) { | 1951 | if (IS_ERR(pdata)) { |
| 1952 | DRM_ERROR("failed to parse dt\n"); | 1952 | DRM_ERROR("failed to parse dt\n"); |
| 1953 | return PTR_ERR(pdata); | 1953 | return PTR_ERR(pdata); |
| 1954 | } | 1954 | } |
| 1955 | } else { | 1955 | } else { |
| 1956 | pdata = pdev->dev.platform_data; | 1956 | pdata = dev->platform_data; |
| 1957 | } | 1957 | } |
| 1958 | 1958 | ||
| 1959 | if (!pdata) { | 1959 | if (!pdata) { |
| @@ -1961,14 +1961,14 @@ static int hdmi_probe(struct platform_device *pdev) | |||
| 1961 | return -EINVAL; | 1961 | return -EINVAL; |
| 1962 | } | 1962 | } |
| 1963 | 1963 | ||
| 1964 | drm_hdmi_ctx = devm_kzalloc(&pdev->dev, sizeof(*drm_hdmi_ctx), | 1964 | drm_hdmi_ctx = devm_kzalloc(dev, sizeof(*drm_hdmi_ctx), |
| 1965 | GFP_KERNEL); | 1965 | GFP_KERNEL); |
| 1966 | if (!drm_hdmi_ctx) { | 1966 | if (!drm_hdmi_ctx) { |
| 1967 | DRM_ERROR("failed to allocate common hdmi context.\n"); | 1967 | DRM_ERROR("failed to allocate common hdmi context.\n"); |
| 1968 | return -ENOMEM; | 1968 | return -ENOMEM; |
| 1969 | } | 1969 | } |
| 1970 | 1970 | ||
| 1971 | hdata = devm_kzalloc(&pdev->dev, sizeof(struct hdmi_context), | 1971 | hdata = devm_kzalloc(dev, sizeof(struct hdmi_context), |
| 1972 | GFP_KERNEL); | 1972 | GFP_KERNEL); |
| 1973 | if (!hdata) { | 1973 | if (!hdata) { |
| 1974 | DRM_ERROR("out of memory\n"); | 1974 | DRM_ERROR("out of memory\n"); |
| @@ -1985,7 +1985,7 @@ static int hdmi_probe(struct platform_device *pdev) | |||
| 1985 | if (dev->of_node) { | 1985 | if (dev->of_node) { |
| 1986 | const struct of_device_id *match; | 1986 | const struct of_device_id *match; |
| 1987 | match = of_match_node(of_match_ptr(hdmi_match_types), | 1987 | match = of_match_node(of_match_ptr(hdmi_match_types), |
| 1988 | pdev->dev.of_node); | 1988 | dev->of_node); |
| 1989 | if (match == NULL) | 1989 | if (match == NULL) |
| 1990 | return -ENODEV; | 1990 | return -ENODEV; |
| 1991 | hdata->type = (enum hdmi_type)match->data; | 1991 | hdata->type = (enum hdmi_type)match->data; |
| @@ -2005,11 +2005,11 @@ static int hdmi_probe(struct platform_device *pdev) | |||
| 2005 | } | 2005 | } |
| 2006 | 2006 | ||
| 2007 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 2007 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 2008 | hdata->regs = devm_ioremap_resource(&pdev->dev, res); | 2008 | hdata->regs = devm_ioremap_resource(dev, res); |
| 2009 | if (IS_ERR(hdata->regs)) | 2009 | if (IS_ERR(hdata->regs)) |
| 2010 | return PTR_ERR(hdata->regs); | 2010 | return PTR_ERR(hdata->regs); |
| 2011 | 2011 | ||
| 2012 | ret = devm_gpio_request(&pdev->dev, hdata->hpd_gpio, "HPD"); | 2012 | ret = devm_gpio_request(dev, hdata->hpd_gpio, "HPD"); |
| 2013 | if (ret) { | 2013 | if (ret) { |
| 2014 | DRM_ERROR("failed to request HPD gpio\n"); | 2014 | DRM_ERROR("failed to request HPD gpio\n"); |
| 2015 | return ret; | 2015 | return ret; |
| @@ -2041,7 +2041,7 @@ static int hdmi_probe(struct platform_device *pdev) | |||
| 2041 | 2041 | ||
| 2042 | hdata->hpd = gpio_get_value(hdata->hpd_gpio); | 2042 | hdata->hpd = gpio_get_value(hdata->hpd_gpio); |
| 2043 | 2043 | ||
| 2044 | ret = request_threaded_irq(hdata->irq, NULL, | 2044 | ret = devm_request_threaded_irq(dev, hdata->irq, NULL, |
| 2045 | hdmi_irq_thread, IRQF_TRIGGER_RISING | | 2045 | hdmi_irq_thread, IRQF_TRIGGER_RISING | |
| 2046 | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, | 2046 | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, |
| 2047 | "hdmi", drm_hdmi_ctx); | 2047 | "hdmi", drm_hdmi_ctx); |
| @@ -2070,16 +2070,11 @@ err_ddc: | |||
| 2070 | static int hdmi_remove(struct platform_device *pdev) | 2070 | static int hdmi_remove(struct platform_device *pdev) |
| 2071 | { | 2071 | { |
| 2072 | struct device *dev = &pdev->dev; | 2072 | struct device *dev = &pdev->dev; |
| 2073 | struct exynos_drm_hdmi_context *ctx = platform_get_drvdata(pdev); | ||
| 2074 | struct hdmi_context *hdata = ctx->ctx; | ||
| 2075 | 2073 | ||
| 2076 | DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__); | 2074 | DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__); |
| 2077 | 2075 | ||
| 2078 | pm_runtime_disable(dev); | 2076 | pm_runtime_disable(dev); |
| 2079 | 2077 | ||
| 2080 | free_irq(hdata->irq, hdata); | ||
| 2081 | |||
| 2082 | |||
| 2083 | /* hdmiphy i2c driver */ | 2078 | /* hdmiphy i2c driver */ |
| 2084 | i2c_del_driver(&hdmiphy_driver); | 2079 | i2c_del_driver(&hdmiphy_driver); |
| 2085 | /* DDC i2c driver */ | 2080 | /* DDC i2c driver */ |
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index ec3e376b7e01..7c197d3820c5 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c | |||
| @@ -1061,7 +1061,7 @@ static int mixer_resources_init(struct exynos_drm_hdmi_context *ctx, | |||
| 1061 | return -ENXIO; | 1061 | return -ENXIO; |
| 1062 | } | 1062 | } |
| 1063 | 1063 | ||
| 1064 | mixer_res->mixer_regs = devm_ioremap(&pdev->dev, res->start, | 1064 | mixer_res->mixer_regs = devm_ioremap(dev, res->start, |
| 1065 | resource_size(res)); | 1065 | resource_size(res)); |
| 1066 | if (mixer_res->mixer_regs == NULL) { | 1066 | if (mixer_res->mixer_regs == NULL) { |
| 1067 | dev_err(dev, "register mapping failed.\n"); | 1067 | dev_err(dev, "register mapping failed.\n"); |
| @@ -1074,7 +1074,7 @@ static int mixer_resources_init(struct exynos_drm_hdmi_context *ctx, | |||
| 1074 | return -ENXIO; | 1074 | return -ENXIO; |
| 1075 | } | 1075 | } |
| 1076 | 1076 | ||
| 1077 | ret = devm_request_irq(&pdev->dev, res->start, mixer_irq_handler, | 1077 | ret = devm_request_irq(dev, res->start, mixer_irq_handler, |
| 1078 | 0, "drm_mixer", ctx); | 1078 | 0, "drm_mixer", ctx); |
| 1079 | if (ret) { | 1079 | if (ret) { |
| 1080 | dev_err(dev, "request interrupt failed.\n"); | 1080 | dev_err(dev, "request interrupt failed.\n"); |
| @@ -1118,7 +1118,7 @@ static int vp_resources_init(struct exynos_drm_hdmi_context *ctx, | |||
| 1118 | return -ENXIO; | 1118 | return -ENXIO; |
| 1119 | } | 1119 | } |
| 1120 | 1120 | ||
| 1121 | mixer_res->vp_regs = devm_ioremap(&pdev->dev, res->start, | 1121 | mixer_res->vp_regs = devm_ioremap(dev, res->start, |
| 1122 | resource_size(res)); | 1122 | resource_size(res)); |
| 1123 | if (mixer_res->vp_regs == NULL) { | 1123 | if (mixer_res->vp_regs == NULL) { |
| 1124 | dev_err(dev, "register mapping failed.\n"); | 1124 | dev_err(dev, "register mapping failed.\n"); |
| @@ -1169,14 +1169,14 @@ static int mixer_probe(struct platform_device *pdev) | |||
| 1169 | 1169 | ||
| 1170 | dev_info(dev, "probe start\n"); | 1170 | dev_info(dev, "probe start\n"); |
| 1171 | 1171 | ||
| 1172 | drm_hdmi_ctx = devm_kzalloc(&pdev->dev, sizeof(*drm_hdmi_ctx), | 1172 | drm_hdmi_ctx = devm_kzalloc(dev, sizeof(*drm_hdmi_ctx), |
| 1173 | GFP_KERNEL); | 1173 | GFP_KERNEL); |
| 1174 | if (!drm_hdmi_ctx) { | 1174 | if (!drm_hdmi_ctx) { |
| 1175 | DRM_ERROR("failed to allocate common hdmi context.\n"); | 1175 | DRM_ERROR("failed to allocate common hdmi context.\n"); |
| 1176 | return -ENOMEM; | 1176 | return -ENOMEM; |
| 1177 | } | 1177 | } |
| 1178 | 1178 | ||
| 1179 | ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL); | 1179 | ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL); |
| 1180 | if (!ctx) { | 1180 | if (!ctx) { |
| 1181 | DRM_ERROR("failed to alloc mixer context.\n"); | 1181 | DRM_ERROR("failed to alloc mixer context.\n"); |
| 1182 | return -ENOMEM; | 1182 | return -ENOMEM; |
| @@ -1187,14 +1187,14 @@ static int mixer_probe(struct platform_device *pdev) | |||
| 1187 | if (dev->of_node) { | 1187 | if (dev->of_node) { |
| 1188 | const struct of_device_id *match; | 1188 | const struct of_device_id *match; |
| 1189 | match = of_match_node(of_match_ptr(mixer_match_types), | 1189 | match = of_match_node(of_match_ptr(mixer_match_types), |
| 1190 | pdev->dev.of_node); | 1190 | dev->of_node); |
| 1191 | drv = (struct mixer_drv_data *)match->data; | 1191 | drv = (struct mixer_drv_data *)match->data; |
| 1192 | } else { | 1192 | } else { |
| 1193 | drv = (struct mixer_drv_data *) | 1193 | drv = (struct mixer_drv_data *) |
| 1194 | platform_get_device_id(pdev)->driver_data; | 1194 | platform_get_device_id(pdev)->driver_data; |
| 1195 | } | 1195 | } |
| 1196 | 1196 | ||
| 1197 | ctx->dev = &pdev->dev; | 1197 | ctx->dev = dev; |
| 1198 | ctx->parent_ctx = (void *)drm_hdmi_ctx; | 1198 | ctx->parent_ctx = (void *)drm_hdmi_ctx; |
| 1199 | drm_hdmi_ctx->ctx = (void *)ctx; | 1199 | drm_hdmi_ctx->ctx = (void *)ctx; |
| 1200 | ctx->vp_enabled = drv->is_vp_enabled; | 1200 | ctx->vp_enabled = drv->is_vp_enabled; |
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 9ebe895c17d6..a2e4953b8e8d 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
| @@ -364,40 +364,64 @@ static const struct pci_device_id pciidlist[] = { /* aka */ | |||
| 364 | INTEL_VGA_DEVICE(0x016a, &intel_ivybridge_d_info), /* GT2 server */ | 364 | INTEL_VGA_DEVICE(0x016a, &intel_ivybridge_d_info), /* GT2 server */ |
| 365 | INTEL_VGA_DEVICE(0x0402, &intel_haswell_d_info), /* GT1 desktop */ | 365 | INTEL_VGA_DEVICE(0x0402, &intel_haswell_d_info), /* GT1 desktop */ |
| 366 | INTEL_VGA_DEVICE(0x0412, &intel_haswell_d_info), /* GT2 desktop */ | 366 | INTEL_VGA_DEVICE(0x0412, &intel_haswell_d_info), /* GT2 desktop */ |
| 367 | INTEL_VGA_DEVICE(0x0422, &intel_haswell_d_info), /* GT2 desktop */ | 367 | INTEL_VGA_DEVICE(0x0422, &intel_haswell_d_info), /* GT3 desktop */ |
| 368 | INTEL_VGA_DEVICE(0x040a, &intel_haswell_d_info), /* GT1 server */ | 368 | INTEL_VGA_DEVICE(0x040a, &intel_haswell_d_info), /* GT1 server */ |
| 369 | INTEL_VGA_DEVICE(0x041a, &intel_haswell_d_info), /* GT2 server */ | 369 | INTEL_VGA_DEVICE(0x041a, &intel_haswell_d_info), /* GT2 server */ |
| 370 | INTEL_VGA_DEVICE(0x042a, &intel_haswell_d_info), /* GT2 server */ | 370 | INTEL_VGA_DEVICE(0x042a, &intel_haswell_d_info), /* GT3 server */ |
| 371 | INTEL_VGA_DEVICE(0x0406, &intel_haswell_m_info), /* GT1 mobile */ | 371 | INTEL_VGA_DEVICE(0x0406, &intel_haswell_m_info), /* GT1 mobile */ |
| 372 | INTEL_VGA_DEVICE(0x0416, &intel_haswell_m_info), /* GT2 mobile */ | 372 | INTEL_VGA_DEVICE(0x0416, &intel_haswell_m_info), /* GT2 mobile */ |
| 373 | INTEL_VGA_DEVICE(0x0426, &intel_haswell_m_info), /* GT2 mobile */ | 373 | INTEL_VGA_DEVICE(0x0426, &intel_haswell_m_info), /* GT2 mobile */ |
| 374 | INTEL_VGA_DEVICE(0x040B, &intel_haswell_d_info), /* GT1 reserved */ | ||
| 375 | INTEL_VGA_DEVICE(0x041B, &intel_haswell_d_info), /* GT2 reserved */ | ||
| 376 | INTEL_VGA_DEVICE(0x042B, &intel_haswell_d_info), /* GT3 reserved */ | ||
| 377 | INTEL_VGA_DEVICE(0x040E, &intel_haswell_d_info), /* GT1 reserved */ | ||
| 378 | INTEL_VGA_DEVICE(0x041E, &intel_haswell_d_info), /* GT2 reserved */ | ||
| 379 | INTEL_VGA_DEVICE(0x042E, &intel_haswell_d_info), /* GT3 reserved */ | ||
| 374 | INTEL_VGA_DEVICE(0x0C02, &intel_haswell_d_info), /* SDV GT1 desktop */ | 380 | INTEL_VGA_DEVICE(0x0C02, &intel_haswell_d_info), /* SDV GT1 desktop */ |
| 375 | INTEL_VGA_DEVICE(0x0C12, &intel_haswell_d_info), /* SDV GT2 desktop */ | 381 | INTEL_VGA_DEVICE(0x0C12, &intel_haswell_d_info), /* SDV GT2 desktop */ |
| 376 | INTEL_VGA_DEVICE(0x0C22, &intel_haswell_d_info), /* SDV GT2 desktop */ | 382 | INTEL_VGA_DEVICE(0x0C22, &intel_haswell_d_info), /* SDV GT3 desktop */ |
| 377 | INTEL_VGA_DEVICE(0x0C0A, &intel_haswell_d_info), /* SDV GT1 server */ | 383 | INTEL_VGA_DEVICE(0x0C0A, &intel_haswell_d_info), /* SDV GT1 server */ |
| 378 | INTEL_VGA_DEVICE(0x0C1A, &intel_haswell_d_info), /* SDV GT2 server */ | 384 | INTEL_VGA_DEVICE(0x0C1A, &intel_haswell_d_info), /* SDV GT2 server */ |
| 379 | INTEL_VGA_DEVICE(0x0C2A, &intel_haswell_d_info), /* SDV GT2 server */ | 385 | INTEL_VGA_DEVICE(0x0C2A, &intel_haswell_d_info), /* SDV GT3 server */ |
| 380 | INTEL_VGA_DEVICE(0x0C06, &intel_haswell_m_info), /* SDV GT1 mobile */ | 386 | INTEL_VGA_DEVICE(0x0C06, &intel_haswell_m_info), /* SDV GT1 mobile */ |
| 381 | INTEL_VGA_DEVICE(0x0C16, &intel_haswell_m_info), /* SDV GT2 mobile */ | 387 | INTEL_VGA_DEVICE(0x0C16, &intel_haswell_m_info), /* SDV GT2 mobile */ |
| 382 | INTEL_VGA_DEVICE(0x0C26, &intel_haswell_m_info), /* SDV GT2 mobile */ | 388 | INTEL_VGA_DEVICE(0x0C26, &intel_haswell_m_info), /* SDV GT3 mobile */ |
| 389 | INTEL_VGA_DEVICE(0x0C0B, &intel_haswell_d_info), /* SDV GT1 reserved */ | ||
| 390 | INTEL_VGA_DEVICE(0x0C1B, &intel_haswell_d_info), /* SDV GT2 reserved */ | ||
| 391 | INTEL_VGA_DEVICE(0x0C2B, &intel_haswell_d_info), /* SDV GT3 reserved */ | ||
| 392 | INTEL_VGA_DEVICE(0x0C0E, &intel_haswell_d_info), /* SDV GT1 reserved */ | ||
| 393 | INTEL_VGA_DEVICE(0x0C1E, &intel_haswell_d_info), /* SDV GT2 reserved */ | ||
| 394 | INTEL_VGA_DEVICE(0x0C2E, &intel_haswell_d_info), /* SDV GT3 reserved */ | ||
| 383 | INTEL_VGA_DEVICE(0x0A02, &intel_haswell_d_info), /* ULT GT1 desktop */ | 395 | INTEL_VGA_DEVICE(0x0A02, &intel_haswell_d_info), /* ULT GT1 desktop */ |
| 384 | INTEL_VGA_DEVICE(0x0A12, &intel_haswell_d_info), /* ULT GT2 desktop */ | 396 | INTEL_VGA_DEVICE(0x0A12, &intel_haswell_d_info), /* ULT GT2 desktop */ |
| 385 | INTEL_VGA_DEVICE(0x0A22, &intel_haswell_d_info), /* ULT GT2 desktop */ | 397 | INTEL_VGA_DEVICE(0x0A22, &intel_haswell_d_info), /* ULT GT3 desktop */ |
| 386 | INTEL_VGA_DEVICE(0x0A0A, &intel_haswell_d_info), /* ULT GT1 server */ | 398 | INTEL_VGA_DEVICE(0x0A0A, &intel_haswell_d_info), /* ULT GT1 server */ |
| 387 | INTEL_VGA_DEVICE(0x0A1A, &intel_haswell_d_info), /* ULT GT2 server */ | 399 | INTEL_VGA_DEVICE(0x0A1A, &intel_haswell_d_info), /* ULT GT2 server */ |
| 388 | INTEL_VGA_DEVICE(0x0A2A, &intel_haswell_d_info), /* ULT GT2 server */ | 400 | INTEL_VGA_DEVICE(0x0A2A, &intel_haswell_d_info), /* ULT GT3 server */ |
| 389 | INTEL_VGA_DEVICE(0x0A06, &intel_haswell_m_info), /* ULT GT1 mobile */ | 401 | INTEL_VGA_DEVICE(0x0A06, &intel_haswell_m_info), /* ULT GT1 mobile */ |
| 390 | INTEL_VGA_DEVICE(0x0A16, &intel_haswell_m_info), /* ULT GT2 mobile */ | 402 | INTEL_VGA_DEVICE(0x0A16, &intel_haswell_m_info), /* ULT GT2 mobile */ |
| 391 | INTEL_VGA_DEVICE(0x0A26, &intel_haswell_m_info), /* ULT GT2 mobile */ | 403 | INTEL_VGA_DEVICE(0x0A26, &intel_haswell_m_info), /* ULT GT3 mobile */ |
| 404 | INTEL_VGA_DEVICE(0x0A0B, &intel_haswell_d_info), /* ULT GT1 reserved */ | ||
| 405 | INTEL_VGA_DEVICE(0x0A1B, &intel_haswell_d_info), /* ULT GT2 reserved */ | ||
| 406 | INTEL_VGA_DEVICE(0x0A2B, &intel_haswell_d_info), /* ULT GT3 reserved */ | ||
| 407 | INTEL_VGA_DEVICE(0x0A0E, &intel_haswell_m_info), /* ULT GT1 reserved */ | ||
| 408 | INTEL_VGA_DEVICE(0x0A1E, &intel_haswell_m_info), /* ULT GT2 reserved */ | ||
| 409 | INTEL_VGA_DEVICE(0x0A2E, &intel_haswell_m_info), /* ULT GT3 reserved */ | ||
| 392 | INTEL_VGA_DEVICE(0x0D02, &intel_haswell_d_info), /* CRW GT1 desktop */ | 410 | INTEL_VGA_DEVICE(0x0D02, &intel_haswell_d_info), /* CRW GT1 desktop */ |
| 393 | INTEL_VGA_DEVICE(0x0D12, &intel_haswell_d_info), /* CRW GT2 desktop */ | 411 | INTEL_VGA_DEVICE(0x0D12, &intel_haswell_d_info), /* CRW GT2 desktop */ |
| 394 | INTEL_VGA_DEVICE(0x0D22, &intel_haswell_d_info), /* CRW GT2 desktop */ | 412 | INTEL_VGA_DEVICE(0x0D22, &intel_haswell_d_info), /* CRW GT3 desktop */ |
| 395 | INTEL_VGA_DEVICE(0x0D0A, &intel_haswell_d_info), /* CRW GT1 server */ | 413 | INTEL_VGA_DEVICE(0x0D0A, &intel_haswell_d_info), /* CRW GT1 server */ |
| 396 | INTEL_VGA_DEVICE(0x0D1A, &intel_haswell_d_info), /* CRW GT2 server */ | 414 | INTEL_VGA_DEVICE(0x0D1A, &intel_haswell_d_info), /* CRW GT2 server */ |
| 397 | INTEL_VGA_DEVICE(0x0D2A, &intel_haswell_d_info), /* CRW GT2 server */ | 415 | INTEL_VGA_DEVICE(0x0D2A, &intel_haswell_d_info), /* CRW GT3 server */ |
| 398 | INTEL_VGA_DEVICE(0x0D06, &intel_haswell_m_info), /* CRW GT1 mobile */ | 416 | INTEL_VGA_DEVICE(0x0D06, &intel_haswell_m_info), /* CRW GT1 mobile */ |
| 399 | INTEL_VGA_DEVICE(0x0D16, &intel_haswell_m_info), /* CRW GT2 mobile */ | 417 | INTEL_VGA_DEVICE(0x0D16, &intel_haswell_m_info), /* CRW GT2 mobile */ |
| 400 | INTEL_VGA_DEVICE(0x0D26, &intel_haswell_m_info), /* CRW GT2 mobile */ | 418 | INTEL_VGA_DEVICE(0x0D26, &intel_haswell_m_info), /* CRW GT3 mobile */ |
| 419 | INTEL_VGA_DEVICE(0x0D0B, &intel_haswell_d_info), /* CRW GT1 reserved */ | ||
| 420 | INTEL_VGA_DEVICE(0x0D1B, &intel_haswell_d_info), /* CRW GT2 reserved */ | ||
| 421 | INTEL_VGA_DEVICE(0x0D2B, &intel_haswell_d_info), /* CRW GT3 reserved */ | ||
| 422 | INTEL_VGA_DEVICE(0x0D0E, &intel_haswell_d_info), /* CRW GT1 reserved */ | ||
| 423 | INTEL_VGA_DEVICE(0x0D1E, &intel_haswell_d_info), /* CRW GT2 reserved */ | ||
| 424 | INTEL_VGA_DEVICE(0x0D2E, &intel_haswell_d_info), /* CRW GT3 reserved */ | ||
| 401 | INTEL_VGA_DEVICE(0x0f30, &intel_valleyview_m_info), | 425 | INTEL_VGA_DEVICE(0x0f30, &intel_valleyview_m_info), |
| 402 | INTEL_VGA_DEVICE(0x0f31, &intel_valleyview_m_info), | 426 | INTEL_VGA_DEVICE(0x0f31, &intel_valleyview_m_info), |
| 403 | INTEL_VGA_DEVICE(0x0f32, &intel_valleyview_m_info), | 427 | INTEL_VGA_DEVICE(0x0f32, &intel_valleyview_m_info), |
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index d5dcf7fe1ee9..b9d00dcf9a2d 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
| @@ -1943,4 +1943,19 @@ static inline void __user *to_user_ptr(u64 address) | |||
| 1943 | return (void __user *)(uintptr_t)address; | 1943 | return (void __user *)(uintptr_t)address; |
| 1944 | } | 1944 | } |
| 1945 | 1945 | ||
| 1946 | static inline unsigned long msecs_to_jiffies_timeout(const unsigned int m) | ||
| 1947 | { | ||
| 1948 | unsigned long j = msecs_to_jiffies(m); | ||
| 1949 | |||
| 1950 | return min_t(unsigned long, MAX_JIFFY_OFFSET, j + 1); | ||
| 1951 | } | ||
| 1952 | |||
| 1953 | static inline unsigned long | ||
| 1954 | timespec_to_jiffies_timeout(const struct timespec *value) | ||
| 1955 | { | ||
| 1956 | unsigned long j = timespec_to_jiffies(value); | ||
| 1957 | |||
| 1958 | return min_t(unsigned long, MAX_JIFFY_OFFSET, j + 1); | ||
| 1959 | } | ||
| 1960 | |||
| 1946 | #endif | 1961 | #endif |
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 6165535d15f0..a6cf8e843973 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
| @@ -1003,7 +1003,7 @@ static int __wait_seqno(struct intel_ring_buffer *ring, u32 seqno, | |||
| 1003 | wait_forever = false; | 1003 | wait_forever = false; |
| 1004 | } | 1004 | } |
| 1005 | 1005 | ||
| 1006 | timeout_jiffies = timespec_to_jiffies(&wait_time); | 1006 | timeout_jiffies = timespec_to_jiffies_timeout(&wait_time); |
| 1007 | 1007 | ||
| 1008 | if (WARN_ON(!ring->irq_get(ring))) | 1008 | if (WARN_ON(!ring->irq_get(ring))) |
| 1009 | return -ENODEV; | 1009 | return -ENODEV; |
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index efe829919755..ad1117bebd7e 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
| @@ -8140,6 +8140,21 @@ static void intel_set_config_restore_state(struct drm_device *dev, | |||
| 8140 | } | 8140 | } |
| 8141 | } | 8141 | } |
| 8142 | 8142 | ||
| 8143 | static bool | ||
| 8144 | is_crtc_connector_off(struct drm_crtc *crtc, struct drm_connector *connectors, | ||
| 8145 | int num_connectors) | ||
| 8146 | { | ||
| 8147 | int i; | ||
| 8148 | |||
| 8149 | for (i = 0; i < num_connectors; i++) | ||
| 8150 | if (connectors[i].encoder && | ||
| 8151 | connectors[i].encoder->crtc == crtc && | ||
| 8152 | connectors[i].dpms != DRM_MODE_DPMS_ON) | ||
| 8153 | return true; | ||
| 8154 | |||
| 8155 | return false; | ||
| 8156 | } | ||
| 8157 | |||
| 8143 | static void | 8158 | static void |
| 8144 | intel_set_config_compute_mode_changes(struct drm_mode_set *set, | 8159 | intel_set_config_compute_mode_changes(struct drm_mode_set *set, |
| 8145 | struct intel_set_config *config) | 8160 | struct intel_set_config *config) |
| @@ -8147,7 +8162,11 @@ intel_set_config_compute_mode_changes(struct drm_mode_set *set, | |||
| 8147 | 8162 | ||
| 8148 | /* We should be able to check here if the fb has the same properties | 8163 | /* We should be able to check here if the fb has the same properties |
| 8149 | * and then just flip_or_move it */ | 8164 | * and then just flip_or_move it */ |
| 8150 | if (set->crtc->fb != set->fb) { | 8165 | if (set->connectors != NULL && |
| 8166 | is_crtc_connector_off(set->crtc, *set->connectors, | ||
| 8167 | set->num_connectors)) { | ||
| 8168 | config->mode_changed = true; | ||
| 8169 | } else if (set->crtc->fb != set->fb) { | ||
| 8151 | /* If we have no fb then treat it as a full mode set */ | 8170 | /* If we have no fb then treat it as a full mode set */ |
| 8152 | if (set->crtc->fb == NULL) { | 8171 | if (set->crtc->fb == NULL) { |
| 8153 | DRM_DEBUG_KMS("crtc has no fb, full mode set\n"); | 8172 | DRM_DEBUG_KMS("crtc has no fb, full mode set\n"); |
| @@ -8157,8 +8176,9 @@ intel_set_config_compute_mode_changes(struct drm_mode_set *set, | |||
| 8157 | } else if (set->fb->pixel_format != | 8176 | } else if (set->fb->pixel_format != |
| 8158 | set->crtc->fb->pixel_format) { | 8177 | set->crtc->fb->pixel_format) { |
| 8159 | config->mode_changed = true; | 8178 | config->mode_changed = true; |
| 8160 | } else | 8179 | } else { |
| 8161 | config->fb_changed = true; | 8180 | config->fb_changed = true; |
| 8181 | } | ||
| 8162 | } | 8182 | } |
| 8163 | 8183 | ||
| 8164 | if (set->fb && (set->x != set->crtc->x || set->y != set->crtc->y)) | 8184 | if (set->fb && (set->x != set->crtc->x || set->y != set->crtc->y)) |
| @@ -8332,11 +8352,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set) | |||
| 8332 | 8352 | ||
| 8333 | ret = intel_set_mode(set->crtc, set->mode, | 8353 | ret = intel_set_mode(set->crtc, set->mode, |
| 8334 | set->x, set->y, set->fb); | 8354 | set->x, set->y, set->fb); |
| 8335 | if (ret) { | ||
| 8336 | DRM_ERROR("failed to set mode on [CRTC:%d], err = %d\n", | ||
| 8337 | set->crtc->base.id, ret); | ||
| 8338 | goto fail; | ||
| 8339 | } | ||
| 8340 | } else if (config->fb_changed) { | 8355 | } else if (config->fb_changed) { |
| 8341 | intel_crtc_wait_for_pending_flips(set->crtc); | 8356 | intel_crtc_wait_for_pending_flips(set->crtc); |
| 8342 | 8357 | ||
| @@ -8344,18 +8359,18 @@ static int intel_crtc_set_config(struct drm_mode_set *set) | |||
| 8344 | set->x, set->y, set->fb); | 8359 | set->x, set->y, set->fb); |
| 8345 | } | 8360 | } |
| 8346 | 8361 | ||
| 8347 | intel_set_config_free(config); | 8362 | if (ret) { |
| 8348 | 8363 | DRM_ERROR("failed to set mode on [CRTC:%d], err = %d\n", | |
| 8349 | return 0; | 8364 | set->crtc->base.id, ret); |
| 8350 | |||
| 8351 | fail: | 8365 | fail: |
| 8352 | intel_set_config_restore_state(dev, config); | 8366 | intel_set_config_restore_state(dev, config); |
| 8353 | 8367 | ||
| 8354 | /* Try to restore the config */ | 8368 | /* Try to restore the config */ |
| 8355 | if (config->mode_changed && | 8369 | if (config->mode_changed && |
| 8356 | intel_set_mode(save_set.crtc, save_set.mode, | 8370 | intel_set_mode(save_set.crtc, save_set.mode, |
| 8357 | save_set.x, save_set.y, save_set.fb)) | 8371 | save_set.x, save_set.y, save_set.fb)) |
| 8358 | DRM_ERROR("failed to restore config after modeset failure\n"); | 8372 | DRM_ERROR("failed to restore config after modeset failure\n"); |
| 8373 | } | ||
| 8359 | 8374 | ||
| 8360 | out_config: | 8375 | out_config: |
| 8361 | intel_set_config_free(config); | 8376 | intel_set_config_free(config); |
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 3d704b706a8d..70789b1b5642 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
| @@ -303,7 +303,7 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp, bool has_aux_irq) | |||
| 303 | #define C (((status = I915_READ_NOTRACE(ch_ctl)) & DP_AUX_CH_CTL_SEND_BUSY) == 0) | 303 | #define C (((status = I915_READ_NOTRACE(ch_ctl)) & DP_AUX_CH_CTL_SEND_BUSY) == 0) |
| 304 | if (has_aux_irq) | 304 | if (has_aux_irq) |
| 305 | done = wait_event_timeout(dev_priv->gmbus_wait_queue, C, | 305 | done = wait_event_timeout(dev_priv->gmbus_wait_queue, C, |
| 306 | msecs_to_jiffies(10)); | 306 | msecs_to_jiffies_timeout(10)); |
| 307 | else | 307 | else |
| 308 | done = wait_for_atomic(C, 10) == 0; | 308 | done = wait_for_atomic(C, 10) == 0; |
| 309 | if (!done) | 309 | if (!done) |
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c index 5d245031e391..639fe192997c 100644 --- a/drivers/gpu/drm/i915/intel_i2c.c +++ b/drivers/gpu/drm/i915/intel_i2c.c | |||
| @@ -228,7 +228,7 @@ gmbus_wait_hw_status(struct drm_i915_private *dev_priv, | |||
| 228 | * need to wake up periodically and check that ourselves. */ | 228 | * need to wake up periodically and check that ourselves. */ |
| 229 | I915_WRITE(GMBUS4 + reg_offset, gmbus4_irq_en); | 229 | I915_WRITE(GMBUS4 + reg_offset, gmbus4_irq_en); |
| 230 | 230 | ||
| 231 | for (i = 0; i < msecs_to_jiffies(50) + 1; i++) { | 231 | for (i = 0; i < msecs_to_jiffies_timeout(50); i++) { |
| 232 | prepare_to_wait(&dev_priv->gmbus_wait_queue, &wait, | 232 | prepare_to_wait(&dev_priv->gmbus_wait_queue, &wait, |
| 233 | TASK_UNINTERRUPTIBLE); | 233 | TASK_UNINTERRUPTIBLE); |
| 234 | 234 | ||
| @@ -263,7 +263,8 @@ gmbus_wait_idle(struct drm_i915_private *dev_priv) | |||
| 263 | /* Important: The hw handles only the first bit, so set only one! */ | 263 | /* Important: The hw handles only the first bit, so set only one! */ |
| 264 | I915_WRITE(GMBUS4 + reg_offset, GMBUS_IDLE_EN); | 264 | I915_WRITE(GMBUS4 + reg_offset, GMBUS_IDLE_EN); |
| 265 | 265 | ||
| 266 | ret = wait_event_timeout(dev_priv->gmbus_wait_queue, C, 10); | 266 | ret = wait_event_timeout(dev_priv->gmbus_wait_queue, C, |
| 267 | msecs_to_jiffies_timeout(10)); | ||
| 267 | 268 | ||
| 268 | I915_WRITE(GMBUS4 + reg_offset, 0); | 269 | I915_WRITE(GMBUS4 + reg_offset, 0); |
| 269 | 270 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index 7bf22d4a3d96..f17dc2ab03ec 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c | |||
| @@ -638,17 +638,8 @@ nouveau_finish_page_flip(struct nouveau_channel *chan, | |||
| 638 | } | 638 | } |
| 639 | 639 | ||
| 640 | s = list_first_entry(&fctx->flip, struct nouveau_page_flip_state, head); | 640 | s = list_first_entry(&fctx->flip, struct nouveau_page_flip_state, head); |
| 641 | if (s->event) { | 641 | if (s->event) |
| 642 | struct drm_pending_vblank_event *e = s->event; | 642 | drm_send_vblank_event(dev, -1, s->event); |
| 643 | struct timeval now; | ||
| 644 | |||
| 645 | do_gettimeofday(&now); | ||
| 646 | e->event.sequence = 0; | ||
| 647 | e->event.tv_sec = now.tv_sec; | ||
| 648 | e->event.tv_usec = now.tv_usec; | ||
| 649 | list_add_tail(&e->base.link, &e->base.file_priv->event_list); | ||
| 650 | wake_up_interruptible(&e->base.file_priv->event_wait); | ||
| 651 | } | ||
| 652 | 643 | ||
| 653 | list_del(&s->head); | 644 | list_del(&s->head); |
| 654 | if (ps) | 645 | if (ps) |
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index 9c53c25e5201..826586ffbe83 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c | |||
| @@ -649,6 +649,9 @@ static void pdev_shutdown(struct platform_device *device) | |||
| 649 | 649 | ||
| 650 | static int pdev_probe(struct platform_device *device) | 650 | static int pdev_probe(struct platform_device *device) |
| 651 | { | 651 | { |
| 652 | if (omapdss_is_initialized() == false) | ||
| 653 | return -EPROBE_DEFER; | ||
| 654 | |||
| 652 | DBG("%s", device->name); | 655 | DBG("%s", device->name); |
| 653 | return drm_platform_init(&omap_drm_driver, device); | 656 | return drm_platform_init(&omap_drm_driver, device); |
| 654 | } | 657 | } |
diff --git a/drivers/gpu/drm/qxl/Kconfig b/drivers/gpu/drm/qxl/Kconfig index 2f1a57e11140..d6c12796023c 100644 --- a/drivers/gpu/drm/qxl/Kconfig +++ b/drivers/gpu/drm/qxl/Kconfig | |||
| @@ -4,6 +4,7 @@ config DRM_QXL | |||
| 4 | select FB_SYS_FILLRECT | 4 | select FB_SYS_FILLRECT |
| 5 | select FB_SYS_COPYAREA | 5 | select FB_SYS_COPYAREA |
| 6 | select FB_SYS_IMAGEBLIT | 6 | select FB_SYS_IMAGEBLIT |
| 7 | select FB_DEFERRED_IO | ||
| 7 | select DRM_KMS_HELPER | 8 | select DRM_KMS_HELPER |
| 8 | select DRM_TTM | 9 | select DRM_TTM |
| 9 | help | 10 | help |
diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c index 6db7370373ea..a4b71b25fa53 100644 --- a/drivers/gpu/drm/qxl/qxl_ioctl.c +++ b/drivers/gpu/drm/qxl/qxl_ioctl.c | |||
| @@ -151,7 +151,7 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data, | |||
| 151 | struct qxl_bo *cmd_bo; | 151 | struct qxl_bo *cmd_bo; |
| 152 | int release_type; | 152 | int release_type; |
| 153 | struct drm_qxl_command *commands = | 153 | struct drm_qxl_command *commands = |
| 154 | (struct drm_qxl_command *)execbuffer->commands; | 154 | (struct drm_qxl_command *)(uintptr_t)execbuffer->commands; |
| 155 | 155 | ||
| 156 | if (DRM_COPY_FROM_USER(&user_cmd, &commands[cmd_num], | 156 | if (DRM_COPY_FROM_USER(&user_cmd, &commands[cmd_num], |
| 157 | sizeof(user_cmd))) | 157 | sizeof(user_cmd))) |
| @@ -193,7 +193,7 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data, | |||
| 193 | 193 | ||
| 194 | for (i = 0 ; i < user_cmd.relocs_num; ++i) { | 194 | for (i = 0 ; i < user_cmd.relocs_num; ++i) { |
| 195 | if (DRM_COPY_FROM_USER(&reloc, | 195 | if (DRM_COPY_FROM_USER(&reloc, |
| 196 | &((struct drm_qxl_reloc *)user_cmd.relocs)[i], | 196 | &((struct drm_qxl_reloc *)(uintptr_t)user_cmd.relocs)[i], |
| 197 | sizeof(reloc))) { | 197 | sizeof(reloc))) { |
| 198 | qxl_bo_list_unreserve(&reloc_list, true); | 198 | qxl_bo_list_unreserve(&reloc_list, true); |
| 199 | qxl_release_unreserve(qdev, release); | 199 | qxl_release_unreserve(qdev, release); |
diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c index 85127ed24cfd..e27ce2a907cf 100644 --- a/drivers/gpu/drm/qxl/qxl_kms.c +++ b/drivers/gpu/drm/qxl/qxl_kms.c | |||
| @@ -128,12 +128,13 @@ int qxl_device_init(struct qxl_device *qdev, | |||
| 128 | 128 | ||
| 129 | qdev->vram_mapping = io_mapping_create_wc(qdev->vram_base, pci_resource_len(pdev, 0)); | 129 | qdev->vram_mapping = io_mapping_create_wc(qdev->vram_base, pci_resource_len(pdev, 0)); |
| 130 | qdev->surface_mapping = io_mapping_create_wc(qdev->surfaceram_base, qdev->surfaceram_size); | 130 | qdev->surface_mapping = io_mapping_create_wc(qdev->surfaceram_base, qdev->surfaceram_size); |
| 131 | DRM_DEBUG_KMS("qxl: vram %p-%p(%dM %dk), surface %p-%p(%dM %dk)\n", | 131 | DRM_DEBUG_KMS("qxl: vram %llx-%llx(%dM %dk), surface %llx-%llx(%dM %dk)\n", |
| 132 | (void *)qdev->vram_base, (void *)pci_resource_end(pdev, 0), | 132 | (unsigned long long)qdev->vram_base, |
| 133 | (unsigned long long)pci_resource_end(pdev, 0), | ||
| 133 | (int)pci_resource_len(pdev, 0) / 1024 / 1024, | 134 | (int)pci_resource_len(pdev, 0) / 1024 / 1024, |
| 134 | (int)pci_resource_len(pdev, 0) / 1024, | 135 | (int)pci_resource_len(pdev, 0) / 1024, |
| 135 | (void *)qdev->surfaceram_base, | 136 | (unsigned long long)qdev->surfaceram_base, |
| 136 | (void *)pci_resource_end(pdev, 1), | 137 | (unsigned long long)pci_resource_end(pdev, 1), |
| 137 | (int)qdev->surfaceram_size / 1024 / 1024, | 138 | (int)qdev->surfaceram_size / 1024 / 1024, |
| 138 | (int)qdev->surfaceram_size / 1024); | 139 | (int)qdev->surfaceram_size / 1024); |
| 139 | 140 | ||
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 8f9e2d31b255..8546e3b333b4 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
| @@ -4999,8 +4999,7 @@ void evergreen_fini(struct radeon_device *rdev) | |||
| 4999 | 4999 | ||
| 5000 | void evergreen_pcie_gen2_enable(struct radeon_device *rdev) | 5000 | void evergreen_pcie_gen2_enable(struct radeon_device *rdev) |
| 5001 | { | 5001 | { |
| 5002 | u32 link_width_cntl, speed_cntl, mask; | 5002 | u32 link_width_cntl, speed_cntl; |
| 5003 | int ret; | ||
| 5004 | 5003 | ||
| 5005 | if (radeon_pcie_gen2 == 0) | 5004 | if (radeon_pcie_gen2 == 0) |
| 5006 | return; | 5005 | return; |
| @@ -5015,11 +5014,8 @@ void evergreen_pcie_gen2_enable(struct radeon_device *rdev) | |||
| 5015 | if (ASIC_IS_X2(rdev)) | 5014 | if (ASIC_IS_X2(rdev)) |
| 5016 | return; | 5015 | return; |
| 5017 | 5016 | ||
| 5018 | ret = drm_pcie_get_speed_cap_mask(rdev->ddev, &mask); | 5017 | if ((rdev->pdev->bus->max_bus_speed != PCIE_SPEED_5_0GT) && |
| 5019 | if (ret != 0) | 5018 | (rdev->pdev->bus->max_bus_speed != PCIE_SPEED_8_0GT)) |
| 5020 | return; | ||
| 5021 | |||
| 5022 | if (!(mask & DRM_PCIE_SPEED_50)) | ||
| 5023 | return; | 5019 | return; |
| 5024 | 5020 | ||
| 5025 | speed_cntl = RREG32_PCIE_PORT(PCIE_LC_SPEED_CNTL); | 5021 | speed_cntl = RREG32_PCIE_PORT(PCIE_LC_SPEED_CNTL); |
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 1a08008c978b..b45e64848677 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
| @@ -4631,8 +4631,6 @@ static void r600_pcie_gen2_enable(struct radeon_device *rdev) | |||
| 4631 | { | 4631 | { |
| 4632 | u32 link_width_cntl, lanes, speed_cntl, training_cntl, tmp; | 4632 | u32 link_width_cntl, lanes, speed_cntl, training_cntl, tmp; |
| 4633 | u16 link_cntl2; | 4633 | u16 link_cntl2; |
| 4634 | u32 mask; | ||
| 4635 | int ret; | ||
| 4636 | 4634 | ||
| 4637 | if (radeon_pcie_gen2 == 0) | 4635 | if (radeon_pcie_gen2 == 0) |
| 4638 | return; | 4636 | return; |
| @@ -4651,11 +4649,8 @@ static void r600_pcie_gen2_enable(struct radeon_device *rdev) | |||
| 4651 | if (rdev->family <= CHIP_R600) | 4649 | if (rdev->family <= CHIP_R600) |
| 4652 | return; | 4650 | return; |
| 4653 | 4651 | ||
| 4654 | ret = drm_pcie_get_speed_cap_mask(rdev->ddev, &mask); | 4652 | if ((rdev->pdev->bus->max_bus_speed != PCIE_SPEED_5_0GT) && |
| 4655 | if (ret != 0) | 4653 | (rdev->pdev->bus->max_bus_speed != PCIE_SPEED_8_0GT)) |
| 4656 | return; | ||
| 4657 | |||
| 4658 | if (!(mask & DRM_PCIE_SPEED_50)) | ||
| 4659 | return; | 4654 | return; |
| 4660 | 4655 | ||
| 4661 | speed_cntl = RREG32_PCIE_PORT(PCIE_LC_SPEED_CNTL); | 4656 | speed_cntl = RREG32_PCIE_PORT(PCIE_LC_SPEED_CNTL); |
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index c2c59fb1ea01..189973836cff 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c | |||
| @@ -467,23 +467,27 @@ bool radeon_card_posted(struct radeon_device *rdev) | |||
| 467 | { | 467 | { |
| 468 | uint32_t reg; | 468 | uint32_t reg; |
| 469 | 469 | ||
| 470 | /* required for EFI mode on macbook2,1 which uses an r5xx asic */ | ||
| 470 | if (efi_enabled(EFI_BOOT) && | 471 | if (efi_enabled(EFI_BOOT) && |
| 471 | rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE) | 472 | (rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE) && |
| 473 | (rdev->family < CHIP_R600)) | ||
| 472 | return false; | 474 | return false; |
| 473 | 475 | ||
| 476 | if (ASIC_IS_NODCE(rdev)) | ||
| 477 | goto check_memsize; | ||
| 478 | |||
| 474 | /* first check CRTCs */ | 479 | /* first check CRTCs */ |
| 475 | if (ASIC_IS_DCE41(rdev)) { | 480 | if (ASIC_IS_DCE4(rdev)) { |
| 476 | reg = RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET) | | 481 | reg = RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET) | |
| 477 | RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET); | 482 | RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET); |
| 478 | if (reg & EVERGREEN_CRTC_MASTER_EN) | 483 | if (rdev->num_crtc >= 4) { |
| 479 | return true; | 484 | reg |= RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC2_REGISTER_OFFSET) | |
| 480 | } else if (ASIC_IS_DCE4(rdev)) { | 485 | RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC3_REGISTER_OFFSET); |
| 481 | reg = RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET) | | 486 | } |
| 482 | RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET) | | 487 | if (rdev->num_crtc >= 6) { |
| 483 | RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC2_REGISTER_OFFSET) | | 488 | reg |= RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC4_REGISTER_OFFSET) | |
| 484 | RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC3_REGISTER_OFFSET) | | 489 | RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC5_REGISTER_OFFSET); |
| 485 | RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC4_REGISTER_OFFSET) | | 490 | } |
| 486 | RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC5_REGISTER_OFFSET); | ||
| 487 | if (reg & EVERGREEN_CRTC_MASTER_EN) | 491 | if (reg & EVERGREEN_CRTC_MASTER_EN) |
| 488 | return true; | 492 | return true; |
| 489 | } else if (ASIC_IS_AVIVO(rdev)) { | 493 | } else if (ASIC_IS_AVIVO(rdev)) { |
| @@ -500,6 +504,7 @@ bool radeon_card_posted(struct radeon_device *rdev) | |||
| 500 | } | 504 | } |
| 501 | } | 505 | } |
| 502 | 506 | ||
| 507 | check_memsize: | ||
| 503 | /* then check MEM_SIZE, in case the crtcs are off */ | 508 | /* then check MEM_SIZE, in case the crtcs are off */ |
| 504 | if (rdev->family >= CHIP_R600) | 509 | if (rdev->family >= CHIP_R600) |
| 505 | reg = RREG32(R600_CONFIG_MEMSIZE); | 510 | reg = RREG32(R600_CONFIG_MEMSIZE); |
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index e38fd559f1ab..eb18bb7af1cc 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c | |||
| @@ -271,8 +271,6 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id) | |||
| 271 | { | 271 | { |
| 272 | struct radeon_crtc *radeon_crtc = rdev->mode_info.crtcs[crtc_id]; | 272 | struct radeon_crtc *radeon_crtc = rdev->mode_info.crtcs[crtc_id]; |
| 273 | struct radeon_unpin_work *work; | 273 | struct radeon_unpin_work *work; |
| 274 | struct drm_pending_vblank_event *e; | ||
| 275 | struct timeval now; | ||
| 276 | unsigned long flags; | 274 | unsigned long flags; |
| 277 | u32 update_pending; | 275 | u32 update_pending; |
| 278 | int vpos, hpos; | 276 | int vpos, hpos; |
| @@ -328,14 +326,9 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id) | |||
| 328 | radeon_crtc->unpin_work = NULL; | 326 | radeon_crtc->unpin_work = NULL; |
| 329 | 327 | ||
| 330 | /* wakeup userspace */ | 328 | /* wakeup userspace */ |
| 331 | if (work->event) { | 329 | if (work->event) |
| 332 | e = work->event; | 330 | drm_send_vblank_event(rdev->ddev, crtc_id, work->event); |
| 333 | e->event.sequence = drm_vblank_count_and_time(rdev->ddev, crtc_id, &now); | 331 | |
| 334 | e->event.tv_sec = now.tv_sec; | ||
| 335 | e->event.tv_usec = now.tv_usec; | ||
| 336 | list_add_tail(&e->base.link, &e->base.file_priv->event_list); | ||
| 337 | wake_up_interruptible(&e->base.file_priv->event_wait); | ||
| 338 | } | ||
| 339 | spin_unlock_irqrestore(&rdev->ddev->event_lock, flags); | 332 | spin_unlock_irqrestore(&rdev->ddev->event_lock, flags); |
| 340 | 333 | ||
| 341 | drm_vblank_put(rdev->ddev, radeon_crtc->crtc_id); | 334 | drm_vblank_put(rdev->ddev, radeon_crtc->crtc_id); |
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 83f612a9500b..08aef24afe40 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c | |||
| @@ -862,10 +862,8 @@ int rv770_uvd_resume(struct radeon_device *rdev) | |||
| 862 | chip_id = 0x0100000b; | 862 | chip_id = 0x0100000b; |
| 863 | break; | 863 | break; |
| 864 | case CHIP_SUMO: | 864 | case CHIP_SUMO: |
| 865 | chip_id = 0x0100000c; | ||
| 866 | break; | ||
| 867 | case CHIP_SUMO2: | 865 | case CHIP_SUMO2: |
| 868 | chip_id = 0x0100000d; | 866 | chip_id = 0x0100000c; |
| 869 | break; | 867 | break; |
| 870 | case CHIP_PALM: | 868 | case CHIP_PALM: |
| 871 | chip_id = 0x0100000e; | 869 | chip_id = 0x0100000e; |
| @@ -2113,8 +2111,6 @@ static void rv770_pcie_gen2_enable(struct radeon_device *rdev) | |||
| 2113 | { | 2111 | { |
| 2114 | u32 link_width_cntl, lanes, speed_cntl, tmp; | 2112 | u32 link_width_cntl, lanes, speed_cntl, tmp; |
| 2115 | u16 link_cntl2; | 2113 | u16 link_cntl2; |
| 2116 | u32 mask; | ||
| 2117 | int ret; | ||
| 2118 | 2114 | ||
| 2119 | if (radeon_pcie_gen2 == 0) | 2115 | if (radeon_pcie_gen2 == 0) |
| 2120 | return; | 2116 | return; |
| @@ -2129,11 +2125,8 @@ static void rv770_pcie_gen2_enable(struct radeon_device *rdev) | |||
| 2129 | if (ASIC_IS_X2(rdev)) | 2125 | if (ASIC_IS_X2(rdev)) |
| 2130 | return; | 2126 | return; |
| 2131 | 2127 | ||
| 2132 | ret = drm_pcie_get_speed_cap_mask(rdev->ddev, &mask); | 2128 | if ((rdev->pdev->bus->max_bus_speed != PCIE_SPEED_5_0GT) && |
| 2133 | if (ret != 0) | 2129 | (rdev->pdev->bus->max_bus_speed != PCIE_SPEED_8_0GT)) |
| 2134 | return; | ||
| 2135 | |||
| 2136 | if (!(mask & DRM_PCIE_SPEED_50)) | ||
| 2137 | return; | 2130 | return; |
| 2138 | 2131 | ||
| 2139 | DRM_INFO("enabling PCIE gen 2 link speeds, disable with radeon.pcie_gen2=0\n"); | 2132 | DRM_INFO("enabling PCIE gen 2 link speeds, disable with radeon.pcie_gen2=0\n"); |
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 5ffade69af25..d1ba9d88f311 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c | |||
| @@ -2616,7 +2616,7 @@ static void si_gpu_init(struct radeon_device *rdev) | |||
| 2616 | default: | 2616 | default: |
| 2617 | rdev->config.si.max_shader_engines = 1; | 2617 | rdev->config.si.max_shader_engines = 1; |
| 2618 | rdev->config.si.max_tile_pipes = 4; | 2618 | rdev->config.si.max_tile_pipes = 4; |
| 2619 | rdev->config.si.max_cu_per_sh = 2; | 2619 | rdev->config.si.max_cu_per_sh = 5; |
| 2620 | rdev->config.si.max_sh_per_se = 2; | 2620 | rdev->config.si.max_sh_per_se = 2; |
| 2621 | rdev->config.si.max_backends_per_se = 4; | 2621 | rdev->config.si.max_backends_per_se = 4; |
| 2622 | rdev->config.si.max_texture_channel_caches = 4; | 2622 | rdev->config.si.max_texture_channel_caches = 4; |
diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c index 7dff49ed66e7..99e2034e49cc 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c | |||
| @@ -451,27 +451,16 @@ void shmob_drm_crtc_finish_page_flip(struct shmob_drm_crtc *scrtc) | |||
| 451 | { | 451 | { |
| 452 | struct drm_pending_vblank_event *event; | 452 | struct drm_pending_vblank_event *event; |
| 453 | struct drm_device *dev = scrtc->crtc.dev; | 453 | struct drm_device *dev = scrtc->crtc.dev; |
| 454 | struct timeval vblanktime; | ||
| 455 | unsigned long flags; | 454 | unsigned long flags; |
| 456 | 455 | ||
| 457 | spin_lock_irqsave(&dev->event_lock, flags); | 456 | spin_lock_irqsave(&dev->event_lock, flags); |
| 458 | event = scrtc->event; | 457 | event = scrtc->event; |
| 459 | scrtc->event = NULL; | 458 | scrtc->event = NULL; |
| 459 | if (event) { | ||
| 460 | drm_send_vblank_event(dev, 0, event); | ||
| 461 | drm_vblank_put(dev, 0); | ||
| 462 | } | ||
| 460 | spin_unlock_irqrestore(&dev->event_lock, flags); | 463 | spin_unlock_irqrestore(&dev->event_lock, flags); |
| 461 | |||
| 462 | if (event == NULL) | ||
| 463 | return; | ||
| 464 | |||
| 465 | event->event.sequence = drm_vblank_count_and_time(dev, 0, &vblanktime); | ||
| 466 | event->event.tv_sec = vblanktime.tv_sec; | ||
| 467 | event->event.tv_usec = vblanktime.tv_usec; | ||
| 468 | |||
| 469 | spin_lock_irqsave(&dev->event_lock, flags); | ||
| 470 | list_add_tail(&event->base.link, &event->base.file_priv->event_list); | ||
| 471 | wake_up_interruptible(&event->base.file_priv->event_wait); | ||
| 472 | spin_unlock_irqrestore(&dev->event_lock, flags); | ||
| 473 | |||
| 474 | drm_vblank_put(dev, 0); | ||
| 475 | } | 464 | } |
| 476 | 465 | ||
| 477 | static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc, | 466 | static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc, |
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c index b08ca7a9f76b..3f3f0416fbdd 100644 --- a/drivers/infiniband/ulp/srpt/ib_srpt.c +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c | |||
| @@ -2227,6 +2227,27 @@ static void srpt_close_ch(struct srpt_rdma_ch *ch) | |||
| 2227 | } | 2227 | } |
| 2228 | 2228 | ||
| 2229 | /** | 2229 | /** |
| 2230 | * srpt_shutdown_session() - Whether or not a session may be shut down. | ||
| 2231 | */ | ||
| 2232 | static int srpt_shutdown_session(struct se_session *se_sess) | ||
| 2233 | { | ||
| 2234 | struct srpt_rdma_ch *ch = se_sess->fabric_sess_ptr; | ||
| 2235 | unsigned long flags; | ||
| 2236 | |||
| 2237 | spin_lock_irqsave(&ch->spinlock, flags); | ||
| 2238 | if (ch->in_shutdown) { | ||
| 2239 | spin_unlock_irqrestore(&ch->spinlock, flags); | ||
| 2240 | return true; | ||
| 2241 | } | ||
| 2242 | |||
| 2243 | ch->in_shutdown = true; | ||
| 2244 | target_sess_cmd_list_set_waiting(se_sess); | ||
| 2245 | spin_unlock_irqrestore(&ch->spinlock, flags); | ||
| 2246 | |||
| 2247 | return true; | ||
| 2248 | } | ||
| 2249 | |||
| 2250 | /** | ||
| 2230 | * srpt_drain_channel() - Drain a channel by resetting the IB queue pair. | 2251 | * srpt_drain_channel() - Drain a channel by resetting the IB queue pair. |
| 2231 | * @cm_id: Pointer to the CM ID of the channel to be drained. | 2252 | * @cm_id: Pointer to the CM ID of the channel to be drained. |
| 2232 | * | 2253 | * |
| @@ -2264,6 +2285,9 @@ static void srpt_drain_channel(struct ib_cm_id *cm_id) | |||
| 2264 | spin_unlock_irq(&sdev->spinlock); | 2285 | spin_unlock_irq(&sdev->spinlock); |
| 2265 | 2286 | ||
| 2266 | if (do_reset) { | 2287 | if (do_reset) { |
| 2288 | if (ch->sess) | ||
| 2289 | srpt_shutdown_session(ch->sess); | ||
| 2290 | |||
| 2267 | ret = srpt_ch_qp_err(ch); | 2291 | ret = srpt_ch_qp_err(ch); |
| 2268 | if (ret < 0) | 2292 | if (ret < 0) |
| 2269 | printk(KERN_ERR "Setting queue pair in error state" | 2293 | printk(KERN_ERR "Setting queue pair in error state" |
| @@ -2328,7 +2352,7 @@ static void srpt_release_channel_work(struct work_struct *w) | |||
| 2328 | se_sess = ch->sess; | 2352 | se_sess = ch->sess; |
| 2329 | BUG_ON(!se_sess); | 2353 | BUG_ON(!se_sess); |
| 2330 | 2354 | ||
| 2331 | target_wait_for_sess_cmds(se_sess, 0); | 2355 | target_wait_for_sess_cmds(se_sess); |
| 2332 | 2356 | ||
| 2333 | transport_deregister_session_configfs(se_sess); | 2357 | transport_deregister_session_configfs(se_sess); |
| 2334 | transport_deregister_session(se_sess); | 2358 | transport_deregister_session(se_sess); |
| @@ -3467,14 +3491,6 @@ static void srpt_release_cmd(struct se_cmd *se_cmd) | |||
| 3467 | } | 3491 | } |
| 3468 | 3492 | ||
| 3469 | /** | 3493 | /** |
| 3470 | * srpt_shutdown_session() - Whether or not a session may be shut down. | ||
| 3471 | */ | ||
| 3472 | static int srpt_shutdown_session(struct se_session *se_sess) | ||
| 3473 | { | ||
| 3474 | return true; | ||
| 3475 | } | ||
| 3476 | |||
| 3477 | /** | ||
| 3478 | * srpt_close_session() - Forcibly close a session. | 3494 | * srpt_close_session() - Forcibly close a session. |
| 3479 | * | 3495 | * |
| 3480 | * Callback function invoked by the TCM core to clean up sessions associated | 3496 | * Callback function invoked by the TCM core to clean up sessions associated |
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.h b/drivers/infiniband/ulp/srpt/ib_srpt.h index 4caf55cda7b1..3dae156905de 100644 --- a/drivers/infiniband/ulp/srpt/ib_srpt.h +++ b/drivers/infiniband/ulp/srpt/ib_srpt.h | |||
| @@ -325,6 +325,7 @@ struct srpt_rdma_ch { | |||
| 325 | u8 sess_name[36]; | 325 | u8 sess_name[36]; |
| 326 | struct work_struct release_work; | 326 | struct work_struct release_work; |
| 327 | struct completion *release_done; | 327 | struct completion *release_done; |
| 328 | bool in_shutdown; | ||
| 328 | }; | 329 | }; |
| 329 | 330 | ||
| 330 | /** | 331 | /** |
diff --git a/drivers/media/pci/zoran/zoran.h b/drivers/media/pci/zoran/zoran.h index ca2754a3cd63..5e040085c2ff 100644 --- a/drivers/media/pci/zoran/zoran.h +++ b/drivers/media/pci/zoran/zoran.h | |||
| @@ -176,7 +176,7 @@ struct zoran_fh; | |||
| 176 | 176 | ||
| 177 | struct zoran_mapping { | 177 | struct zoran_mapping { |
| 178 | struct zoran_fh *fh; | 178 | struct zoran_fh *fh; |
| 179 | int count; | 179 | atomic_t count; |
| 180 | }; | 180 | }; |
| 181 | 181 | ||
| 182 | struct zoran_buffer { | 182 | struct zoran_buffer { |
diff --git a/drivers/media/pci/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c index 1168a84a737d..d133c30c3fdc 100644 --- a/drivers/media/pci/zoran/zoran_driver.c +++ b/drivers/media/pci/zoran/zoran_driver.c | |||
| @@ -2803,8 +2803,7 @@ static void | |||
| 2803 | zoran_vm_open (struct vm_area_struct *vma) | 2803 | zoran_vm_open (struct vm_area_struct *vma) |
| 2804 | { | 2804 | { |
| 2805 | struct zoran_mapping *map = vma->vm_private_data; | 2805 | struct zoran_mapping *map = vma->vm_private_data; |
| 2806 | 2806 | atomic_inc(&map->count); | |
| 2807 | map->count++; | ||
| 2808 | } | 2807 | } |
| 2809 | 2808 | ||
| 2810 | static void | 2809 | static void |
| @@ -2815,7 +2814,7 @@ zoran_vm_close (struct vm_area_struct *vma) | |||
| 2815 | struct zoran *zr = fh->zr; | 2814 | struct zoran *zr = fh->zr; |
| 2816 | int i; | 2815 | int i; |
| 2817 | 2816 | ||
| 2818 | if (--map->count > 0) | 2817 | if (!atomic_dec_and_mutex_lock(&map->count, &zr->resource_lock)) |
| 2819 | return; | 2818 | return; |
| 2820 | 2819 | ||
| 2821 | dprintk(3, KERN_INFO "%s: %s - munmap(%s)\n", ZR_DEVNAME(zr), | 2820 | dprintk(3, KERN_INFO "%s: %s - munmap(%s)\n", ZR_DEVNAME(zr), |
| @@ -2828,14 +2827,16 @@ zoran_vm_close (struct vm_area_struct *vma) | |||
| 2828 | kfree(map); | 2827 | kfree(map); |
| 2829 | 2828 | ||
| 2830 | /* Any buffers still mapped? */ | 2829 | /* Any buffers still mapped? */ |
| 2831 | for (i = 0; i < fh->buffers.num_buffers; i++) | 2830 | for (i = 0; i < fh->buffers.num_buffers; i++) { |
| 2832 | if (fh->buffers.buffer[i].map) | 2831 | if (fh->buffers.buffer[i].map) { |
| 2832 | mutex_unlock(&zr->resource_lock); | ||
| 2833 | return; | 2833 | return; |
| 2834 | } | ||
| 2835 | } | ||
| 2834 | 2836 | ||
| 2835 | dprintk(3, KERN_INFO "%s: %s - free %s buffers\n", ZR_DEVNAME(zr), | 2837 | dprintk(3, KERN_INFO "%s: %s - free %s buffers\n", ZR_DEVNAME(zr), |
| 2836 | __func__, mode_name(fh->map_mode)); | 2838 | __func__, mode_name(fh->map_mode)); |
| 2837 | 2839 | ||
| 2838 | mutex_lock(&zr->resource_lock); | ||
| 2839 | 2840 | ||
| 2840 | if (fh->map_mode == ZORAN_MAP_MODE_RAW) { | 2841 | if (fh->map_mode == ZORAN_MAP_MODE_RAW) { |
| 2841 | if (fh->buffers.active != ZORAN_FREE) { | 2842 | if (fh->buffers.active != ZORAN_FREE) { |
| @@ -2939,7 +2940,7 @@ zoran_mmap (struct file *file, | |||
| 2939 | goto mmap_unlock_and_return; | 2940 | goto mmap_unlock_and_return; |
| 2940 | } | 2941 | } |
| 2941 | map->fh = fh; | 2942 | map->fh = fh; |
| 2942 | map->count = 1; | 2943 | atomic_set(&map->count, 1); |
| 2943 | 2944 | ||
| 2944 | vma->vm_ops = &zoran_vm_ops; | 2945 | vma->vm_ops = &zoran_vm_ops; |
| 2945 | vma->vm_flags |= VM_DONTEXPAND; | 2946 | vma->vm_flags |= VM_DONTEXPAND; |
diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c index 477268a2415f..d338b19da544 100644 --- a/drivers/media/platform/omap/omap_vout.c +++ b/drivers/media/platform/omap/omap_vout.c | |||
| @@ -2150,6 +2150,9 @@ static int __init omap_vout_probe(struct platform_device *pdev) | |||
| 2150 | struct omap_dss_device *def_display; | 2150 | struct omap_dss_device *def_display; |
| 2151 | struct omap2video_device *vid_dev = NULL; | 2151 | struct omap2video_device *vid_dev = NULL; |
| 2152 | 2152 | ||
| 2153 | if (omapdss_is_initialized() == false) | ||
| 2154 | return -EPROBE_DEFER; | ||
| 2155 | |||
| 2153 | ret = omapdss_compat_init(); | 2156 | ret = omapdss_compat_init(); |
| 2154 | if (ret) { | 2157 | if (ret) { |
| 2155 | dev_err(&pdev->dev, "failed to init dss\n"); | 2158 | dev_err(&pdev->dev, "failed to init dss\n"); |
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c index 2ef7103270bb..1f05913ae677 100644 --- a/drivers/parisc/lba_pci.c +++ b/drivers/parisc/lba_pci.c | |||
| @@ -668,7 +668,7 @@ lba_fixup_bus(struct pci_bus *bus) | |||
| 668 | BUG(); | 668 | BUG(); |
| 669 | } | 669 | } |
| 670 | 670 | ||
| 671 | if (ldev->hba.elmmio_space.start) { | 671 | if (ldev->hba.elmmio_space.flags) { |
| 672 | err = request_resource(&iomem_resource, | 672 | err = request_resource(&iomem_resource, |
| 673 | &(ldev->hba.elmmio_space)); | 673 | &(ldev->hba.elmmio_space)); |
| 674 | if (err < 0) { | 674 | if (err < 0) { |
| @@ -993,7 +993,7 @@ lba_pat_resources(struct parisc_device *pa_dev, struct lba_device *lba_dev) | |||
| 993 | 993 | ||
| 994 | case PAT_LMMIO: | 994 | case PAT_LMMIO: |
| 995 | /* used to fix up pre-initialized MEM BARs */ | 995 | /* used to fix up pre-initialized MEM BARs */ |
| 996 | if (!lba_dev->hba.lmmio_space.start) { | 996 | if (!lba_dev->hba.lmmio_space.flags) { |
| 997 | sprintf(lba_dev->hba.lmmio_name, | 997 | sprintf(lba_dev->hba.lmmio_name, |
| 998 | "PCI%02x LMMIO", | 998 | "PCI%02x LMMIO", |
| 999 | (int)lba_dev->hba.bus_num.start); | 999 | (int)lba_dev->hba.bus_num.start); |
| @@ -1001,7 +1001,7 @@ lba_pat_resources(struct parisc_device *pa_dev, struct lba_device *lba_dev) | |||
| 1001 | io->start; | 1001 | io->start; |
| 1002 | r = &lba_dev->hba.lmmio_space; | 1002 | r = &lba_dev->hba.lmmio_space; |
| 1003 | r->name = lba_dev->hba.lmmio_name; | 1003 | r->name = lba_dev->hba.lmmio_name; |
| 1004 | } else if (!lba_dev->hba.elmmio_space.start) { | 1004 | } else if (!lba_dev->hba.elmmio_space.flags) { |
| 1005 | sprintf(lba_dev->hba.elmmio_name, | 1005 | sprintf(lba_dev->hba.elmmio_name, |
| 1006 | "PCI%02x ELMMIO", | 1006 | "PCI%02x ELMMIO", |
| 1007 | (int)lba_dev->hba.bus_num.start); | 1007 | (int)lba_dev->hba.bus_num.start); |
| @@ -1096,6 +1096,7 @@ lba_legacy_resources(struct parisc_device *pa_dev, struct lba_device *lba_dev) | |||
| 1096 | r->name = "LBA PCI Busses"; | 1096 | r->name = "LBA PCI Busses"; |
| 1097 | r->start = lba_num & 0xff; | 1097 | r->start = lba_num & 0xff; |
| 1098 | r->end = (lba_num>>8) & 0xff; | 1098 | r->end = (lba_num>>8) & 0xff; |
| 1099 | r->flags = IORESOURCE_BUS; | ||
| 1099 | 1100 | ||
| 1100 | /* Set up local PCI Bus resources - we don't need them for | 1101 | /* Set up local PCI Bus resources - we don't need them for |
| 1101 | ** Legacy boxes but it's nice to see in /proc/iomem. | 1102 | ** Legacy boxes but it's nice to see in /proc/iomem. |
| @@ -1494,7 +1495,7 @@ lba_driver_probe(struct parisc_device *dev) | |||
| 1494 | 1495 | ||
| 1495 | pci_add_resource_offset(&resources, &lba_dev->hba.io_space, | 1496 | pci_add_resource_offset(&resources, &lba_dev->hba.io_space, |
| 1496 | HBA_PORT_BASE(lba_dev->hba.hba_num)); | 1497 | HBA_PORT_BASE(lba_dev->hba.hba_num)); |
| 1497 | if (lba_dev->hba.elmmio_space.start) | 1498 | if (lba_dev->hba.elmmio_space.flags) |
| 1498 | pci_add_resource_offset(&resources, &lba_dev->hba.elmmio_space, | 1499 | pci_add_resource_offset(&resources, &lba_dev->hba.elmmio_space, |
| 1499 | lba_dev->hba.lmmio_space_offset); | 1500 | lba_dev->hba.lmmio_space_offset); |
| 1500 | if (lba_dev->hba.lmmio_space.flags) | 1501 | if (lba_dev->hba.lmmio_space.flags) |
diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig index 24e12d4d1769..a50576081b34 100644 --- a/drivers/parport/Kconfig +++ b/drivers/parport/Kconfig | |||
| @@ -71,7 +71,7 @@ config PARPORT_PC_FIFO | |||
| 71 | 71 | ||
| 72 | config PARPORT_PC_SUPERIO | 72 | config PARPORT_PC_SUPERIO |
| 73 | bool "SuperIO chipset support" | 73 | bool "SuperIO chipset support" |
| 74 | depends on PARPORT_PC | 74 | depends on PARPORT_PC && !PARISC |
| 75 | help | 75 | help |
| 76 | Saying Y here enables some probes for Super-IO chipsets in order to | 76 | Saying Y here enables some probes for Super-IO chipsets in order to |
| 77 | find out things like base addresses, IRQ lines and DMA channels. It | 77 | find out things like base addresses, IRQ lines and DMA channels. It |
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c index a5251cb5fb0c..6e3a60c78873 100644 --- a/drivers/parport/parport_gsc.c +++ b/drivers/parport/parport_gsc.c | |||
| @@ -234,7 +234,7 @@ static int parport_PS2_supported(struct parport *pb) | |||
| 234 | 234 | ||
| 235 | struct parport *parport_gsc_probe_port(unsigned long base, | 235 | struct parport *parport_gsc_probe_port(unsigned long base, |
| 236 | unsigned long base_hi, int irq, | 236 | unsigned long base_hi, int irq, |
| 237 | int dma, struct pci_dev *dev) | 237 | int dma, struct parisc_device *padev) |
| 238 | { | 238 | { |
| 239 | struct parport_gsc_private *priv; | 239 | struct parport_gsc_private *priv; |
| 240 | struct parport_operations *ops; | 240 | struct parport_operations *ops; |
| @@ -258,7 +258,6 @@ struct parport *parport_gsc_probe_port(unsigned long base, | |||
| 258 | priv->ctr_writable = 0xff; | 258 | priv->ctr_writable = 0xff; |
| 259 | priv->dma_buf = 0; | 259 | priv->dma_buf = 0; |
| 260 | priv->dma_handle = 0; | 260 | priv->dma_handle = 0; |
| 261 | priv->dev = dev; | ||
| 262 | p->base = base; | 261 | p->base = base; |
| 263 | p->base_hi = base_hi; | 262 | p->base_hi = base_hi; |
| 264 | p->irq = irq; | 263 | p->irq = irq; |
| @@ -282,6 +281,7 @@ struct parport *parport_gsc_probe_port(unsigned long base, | |||
| 282 | return NULL; | 281 | return NULL; |
| 283 | } | 282 | } |
| 284 | 283 | ||
| 284 | p->dev = &padev->dev; | ||
| 285 | p->base_hi = base_hi; | 285 | p->base_hi = base_hi; |
| 286 | p->modes = tmp.modes; | 286 | p->modes = tmp.modes; |
| 287 | p->size = (p->modes & PARPORT_MODE_EPP)?8:3; | 287 | p->size = (p->modes & PARPORT_MODE_EPP)?8:3; |
| @@ -373,7 +373,7 @@ static int parport_init_chip(struct parisc_device *dev) | |||
| 373 | } | 373 | } |
| 374 | 374 | ||
| 375 | p = parport_gsc_probe_port(port, 0, dev->irq, | 375 | p = parport_gsc_probe_port(port, 0, dev->irq, |
| 376 | /* PARPORT_IRQ_NONE */ PARPORT_DMA_NONE, NULL); | 376 | /* PARPORT_IRQ_NONE */ PARPORT_DMA_NONE, dev); |
| 377 | if (p) | 377 | if (p) |
| 378 | parport_count++; | 378 | parport_count++; |
| 379 | dev_set_drvdata(&dev->dev, p); | 379 | dev_set_drvdata(&dev->dev, p); |
diff --git a/drivers/parport/parport_gsc.h b/drivers/parport/parport_gsc.h index fc9c37c54022..812214768d27 100644 --- a/drivers/parport/parport_gsc.h +++ b/drivers/parport/parport_gsc.h | |||
| @@ -217,6 +217,6 @@ extern void parport_gsc_dec_use_count(void); | |||
| 217 | extern struct parport *parport_gsc_probe_port(unsigned long base, | 217 | extern struct parport *parport_gsc_probe_port(unsigned long base, |
| 218 | unsigned long base_hi, | 218 | unsigned long base_hi, |
| 219 | int irq, int dma, | 219 | int irq, int dma, |
| 220 | struct pci_dev *dev); | 220 | struct parisc_device *padev); |
| 221 | 221 | ||
| 222 | #endif /* __DRIVERS_PARPORT_PARPORT_GSC_H */ | 222 | #endif /* __DRIVERS_PARPORT_PARPORT_GSC_H */ |
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c index 8ec8b4f48560..0f4554e48cc5 100644 --- a/drivers/pci/pcie/aer/aerdrv_core.c +++ b/drivers/pci/pcie/aer/aerdrv_core.c | |||
| @@ -580,6 +580,7 @@ struct aer_recover_entry | |||
| 580 | u8 devfn; | 580 | u8 devfn; |
| 581 | u16 domain; | 581 | u16 domain; |
| 582 | int severity; | 582 | int severity; |
| 583 | struct aer_capability_regs *regs; | ||
| 583 | }; | 584 | }; |
| 584 | 585 | ||
| 585 | static DEFINE_KFIFO(aer_recover_ring, struct aer_recover_entry, | 586 | static DEFINE_KFIFO(aer_recover_ring, struct aer_recover_entry, |
| @@ -593,7 +594,7 @@ static DEFINE_SPINLOCK(aer_recover_ring_lock); | |||
| 593 | static DECLARE_WORK(aer_recover_work, aer_recover_work_func); | 594 | static DECLARE_WORK(aer_recover_work, aer_recover_work_func); |
| 594 | 595 | ||
| 595 | void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn, | 596 | void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn, |
| 596 | int severity) | 597 | int severity, struct aer_capability_regs *aer_regs) |
| 597 | { | 598 | { |
| 598 | unsigned long flags; | 599 | unsigned long flags; |
| 599 | struct aer_recover_entry entry = { | 600 | struct aer_recover_entry entry = { |
| @@ -601,6 +602,7 @@ void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn, | |||
| 601 | .devfn = devfn, | 602 | .devfn = devfn, |
| 602 | .domain = domain, | 603 | .domain = domain, |
| 603 | .severity = severity, | 604 | .severity = severity, |
| 605 | .regs = aer_regs, | ||
| 604 | }; | 606 | }; |
| 605 | 607 | ||
| 606 | spin_lock_irqsave(&aer_recover_ring_lock, flags); | 608 | spin_lock_irqsave(&aer_recover_ring_lock, flags); |
| @@ -627,6 +629,7 @@ static void aer_recover_work_func(struct work_struct *work) | |||
| 627 | PCI_SLOT(entry.devfn), PCI_FUNC(entry.devfn)); | 629 | PCI_SLOT(entry.devfn), PCI_FUNC(entry.devfn)); |
| 628 | continue; | 630 | continue; |
| 629 | } | 631 | } |
| 632 | cper_print_aer(pdev, entry.severity, entry.regs); | ||
| 630 | do_recovery(pdev, entry.severity); | 633 | do_recovery(pdev, entry.severity); |
| 631 | pci_dev_put(pdev); | 634 | pci_dev_put(pdev); |
| 632 | } | 635 | } |
diff --git a/drivers/pci/pcie/aer/aerdrv_errprint.c b/drivers/pci/pcie/aer/aerdrv_errprint.c index 5ab14251839d..2c7c9f5f592c 100644 --- a/drivers/pci/pcie/aer/aerdrv_errprint.c +++ b/drivers/pci/pcie/aer/aerdrv_errprint.c | |||
| @@ -220,7 +220,7 @@ int cper_severity_to_aer(int cper_severity) | |||
| 220 | } | 220 | } |
| 221 | EXPORT_SYMBOL_GPL(cper_severity_to_aer); | 221 | EXPORT_SYMBOL_GPL(cper_severity_to_aer); |
| 222 | 222 | ||
| 223 | void cper_print_aer(const char *prefix, struct pci_dev *dev, int cper_severity, | 223 | void cper_print_aer(struct pci_dev *dev, int cper_severity, |
| 224 | struct aer_capability_regs *aer) | 224 | struct aer_capability_regs *aer) |
| 225 | { | 225 | { |
| 226 | int aer_severity, layer, agent, status_strs_size, tlp_header_valid = 0; | 226 | int aer_severity, layer, agent, status_strs_size, tlp_header_valid = 0; |
| @@ -244,7 +244,7 @@ void cper_print_aer(const char *prefix, struct pci_dev *dev, int cper_severity, | |||
| 244 | agent = AER_GET_AGENT(aer_severity, status); | 244 | agent = AER_GET_AGENT(aer_severity, status); |
| 245 | dev_err(&dev->dev, "aer_status: 0x%08x, aer_mask: 0x%08x\n", | 245 | dev_err(&dev->dev, "aer_status: 0x%08x, aer_mask: 0x%08x\n", |
| 246 | status, mask); | 246 | status, mask); |
| 247 | cper_print_bits(prefix, status, status_strs, status_strs_size); | 247 | cper_print_bits("", status, status_strs, status_strs_size); |
| 248 | dev_err(&dev->dev, "aer_layer=%s, aer_agent=%s\n", | 248 | dev_err(&dev->dev, "aer_layer=%s, aer_agent=%s\n", |
| 249 | aer_error_layer[layer], aer_agent_string[agent]); | 249 | aer_error_layer[layer], aer_agent_string[agent]); |
| 250 | if (aer_severity != AER_CORRECTABLE) | 250 | if (aer_severity != AER_CORRECTABLE) |
diff --git a/drivers/pinctrl/pinconf.c b/drivers/pinctrl/pinconf.c index c67c37e23dd7..694c3ace4520 100644 --- a/drivers/pinctrl/pinconf.c +++ b/drivers/pinctrl/pinconf.c | |||
| @@ -610,7 +610,7 @@ static int pinconf_dbg_config_print(struct seq_file *s, void *d) | |||
| 610 | bool found = false; | 610 | bool found = false; |
| 611 | unsigned long config; | 611 | unsigned long config; |
| 612 | 612 | ||
| 613 | mutex_lock(&pctldev->mutex); | 613 | mutex_lock(&pinctrl_maps_mutex); |
| 614 | 614 | ||
| 615 | /* Parse the pinctrl map and look for the elected pin/state */ | 615 | /* Parse the pinctrl map and look for the elected pin/state */ |
| 616 | for_each_maps(maps_node, i, map) { | 616 | for_each_maps(maps_node, i, map) { |
| @@ -659,7 +659,7 @@ static int pinconf_dbg_config_print(struct seq_file *s, void *d) | |||
| 659 | confops->pin_config_config_dbg_show(pctldev, s, config); | 659 | confops->pin_config_config_dbg_show(pctldev, s, config); |
| 660 | 660 | ||
| 661 | exit: | 661 | exit: |
| 662 | mutex_unlock(&pctldev->mutex); | 662 | mutex_unlock(&pinctrl_maps_mutex); |
| 663 | 663 | ||
| 664 | return 0; | 664 | return 0; |
| 665 | } | 665 | } |
diff --git a/drivers/pinctrl/pinctrl-coh901.c b/drivers/pinctrl/pinctrl-coh901.c index a67af419f531..d6b41747d687 100644 --- a/drivers/pinctrl/pinctrl-coh901.c +++ b/drivers/pinctrl/pinctrl-coh901.c | |||
| @@ -830,7 +830,8 @@ static int __init u300_gpio_probe(struct platform_device *pdev) | |||
| 830 | return 0; | 830 | return 0; |
| 831 | 831 | ||
| 832 | err_no_range: | 832 | err_no_range: |
| 833 | err = gpiochip_remove(&gpio->chip); | 833 | if (gpiochip_remove(&gpio->chip)) |
| 834 | dev_err(&pdev->dev, "failed to remove gpio chip\n"); | ||
| 834 | err_no_chip: | 835 | err_no_chip: |
| 835 | err_no_domain: | 836 | err_no_domain: |
| 836 | err_no_port: | 837 | err_no_port: |
diff --git a/drivers/pinctrl/pinctrl-exynos.c b/drivers/pinctrl/pinctrl-exynos.c index ac742817ebce..2d76f66a2e0b 100644 --- a/drivers/pinctrl/pinctrl-exynos.c +++ b/drivers/pinctrl/pinctrl-exynos.c | |||
| @@ -196,6 +196,12 @@ static irqreturn_t exynos_eint_gpio_irq(int irq, void *data) | |||
| 196 | return IRQ_HANDLED; | 196 | return IRQ_HANDLED; |
| 197 | } | 197 | } |
| 198 | 198 | ||
| 199 | struct exynos_eint_gpio_save { | ||
| 200 | u32 eint_con; | ||
| 201 | u32 eint_fltcon0; | ||
| 202 | u32 eint_fltcon1; | ||
| 203 | }; | ||
| 204 | |||
| 199 | /* | 205 | /* |
| 200 | * exynos_eint_gpio_init() - setup handling of external gpio interrupts. | 206 | * exynos_eint_gpio_init() - setup handling of external gpio interrupts. |
| 201 | * @d: driver data of samsung pinctrl driver. | 207 | * @d: driver data of samsung pinctrl driver. |
| @@ -204,8 +210,8 @@ static int exynos_eint_gpio_init(struct samsung_pinctrl_drv_data *d) | |||
| 204 | { | 210 | { |
| 205 | struct samsung_pin_bank *bank; | 211 | struct samsung_pin_bank *bank; |
| 206 | struct device *dev = d->dev; | 212 | struct device *dev = d->dev; |
| 207 | unsigned int ret; | 213 | int ret; |
| 208 | unsigned int i; | 214 | int i; |
| 209 | 215 | ||
| 210 | if (!d->irq) { | 216 | if (!d->irq) { |
| 211 | dev_err(dev, "irq number not available\n"); | 217 | dev_err(dev, "irq number not available\n"); |
| @@ -227,11 +233,29 @@ static int exynos_eint_gpio_init(struct samsung_pinctrl_drv_data *d) | |||
| 227 | bank->nr_pins, &exynos_gpio_irqd_ops, bank); | 233 | bank->nr_pins, &exynos_gpio_irqd_ops, bank); |
| 228 | if (!bank->irq_domain) { | 234 | if (!bank->irq_domain) { |
| 229 | dev_err(dev, "gpio irq domain add failed\n"); | 235 | dev_err(dev, "gpio irq domain add failed\n"); |
| 230 | return -ENXIO; | 236 | ret = -ENXIO; |
| 237 | goto err_domains; | ||
| 238 | } | ||
| 239 | |||
| 240 | bank->soc_priv = devm_kzalloc(d->dev, | ||
| 241 | sizeof(struct exynos_eint_gpio_save), GFP_KERNEL); | ||
| 242 | if (!bank->soc_priv) { | ||
| 243 | irq_domain_remove(bank->irq_domain); | ||
| 244 | ret = -ENOMEM; | ||
| 245 | goto err_domains; | ||
| 231 | } | 246 | } |
| 232 | } | 247 | } |
| 233 | 248 | ||
| 234 | return 0; | 249 | return 0; |
| 250 | |||
| 251 | err_domains: | ||
| 252 | for (--i, --bank; i >= 0; --i, --bank) { | ||
| 253 | if (bank->eint_type != EINT_TYPE_GPIO) | ||
| 254 | continue; | ||
| 255 | irq_domain_remove(bank->irq_domain); | ||
| 256 | } | ||
| 257 | |||
| 258 | return ret; | ||
| 235 | } | 259 | } |
| 236 | 260 | ||
| 237 | static void exynos_wkup_irq_unmask(struct irq_data *irqd) | 261 | static void exynos_wkup_irq_unmask(struct irq_data *irqd) |
| @@ -326,6 +350,28 @@ static int exynos_wkup_irq_set_type(struct irq_data *irqd, unsigned int type) | |||
| 326 | return 0; | 350 | return 0; |
| 327 | } | 351 | } |
| 328 | 352 | ||
| 353 | static u32 exynos_eint_wake_mask = 0xffffffff; | ||
| 354 | |||
| 355 | u32 exynos_get_eint_wake_mask(void) | ||
| 356 | { | ||
| 357 | return exynos_eint_wake_mask; | ||
| 358 | } | ||
| 359 | |||
| 360 | static int exynos_wkup_irq_set_wake(struct irq_data *irqd, unsigned int on) | ||
| 361 | { | ||
| 362 | struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd); | ||
| 363 | unsigned long bit = 1UL << (2 * bank->eint_offset + irqd->hwirq); | ||
| 364 | |||
| 365 | pr_info("wake %s for irq %d\n", on ? "enabled" : "disabled", irqd->irq); | ||
| 366 | |||
| 367 | if (!on) | ||
| 368 | exynos_eint_wake_mask |= bit; | ||
| 369 | else | ||
| 370 | exynos_eint_wake_mask &= ~bit; | ||
| 371 | |||
| 372 | return 0; | ||
| 373 | } | ||
| 374 | |||
| 329 | /* | 375 | /* |
| 330 | * irq_chip for wakeup interrupts | 376 | * irq_chip for wakeup interrupts |
| 331 | */ | 377 | */ |
| @@ -335,6 +381,7 @@ static struct irq_chip exynos_wkup_irq_chip = { | |||
| 335 | .irq_mask = exynos_wkup_irq_mask, | 381 | .irq_mask = exynos_wkup_irq_mask, |
| 336 | .irq_ack = exynos_wkup_irq_ack, | 382 | .irq_ack = exynos_wkup_irq_ack, |
| 337 | .irq_set_type = exynos_wkup_irq_set_type, | 383 | .irq_set_type = exynos_wkup_irq_set_type, |
| 384 | .irq_set_wake = exynos_wkup_irq_set_wake, | ||
| 338 | }; | 385 | }; |
| 339 | 386 | ||
| 340 | /* interrupt handler for wakeup interrupts 0..15 */ | 387 | /* interrupt handler for wakeup interrupts 0..15 */ |
| @@ -505,6 +552,72 @@ static int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d) | |||
| 505 | return 0; | 552 | return 0; |
| 506 | } | 553 | } |
| 507 | 554 | ||
| 555 | static void exynos_pinctrl_suspend_bank( | ||
| 556 | struct samsung_pinctrl_drv_data *drvdata, | ||
| 557 | struct samsung_pin_bank *bank) | ||
| 558 | { | ||
| 559 | struct exynos_eint_gpio_save *save = bank->soc_priv; | ||
| 560 | void __iomem *regs = drvdata->virt_base; | ||
| 561 | |||
| 562 | save->eint_con = readl(regs + EXYNOS_GPIO_ECON_OFFSET | ||
| 563 | + bank->eint_offset); | ||
| 564 | save->eint_fltcon0 = readl(regs + EXYNOS_GPIO_EFLTCON_OFFSET | ||
| 565 | + 2 * bank->eint_offset); | ||
| 566 | save->eint_fltcon1 = readl(regs + EXYNOS_GPIO_EFLTCON_OFFSET | ||
| 567 | + 2 * bank->eint_offset + 4); | ||
| 568 | |||
| 569 | pr_debug("%s: save con %#010x\n", bank->name, save->eint_con); | ||
| 570 | pr_debug("%s: save fltcon0 %#010x\n", bank->name, save->eint_fltcon0); | ||
| 571 | pr_debug("%s: save fltcon1 %#010x\n", bank->name, save->eint_fltcon1); | ||
| 572 | } | ||
| 573 | |||
| 574 | static void exynos_pinctrl_suspend(struct samsung_pinctrl_drv_data *drvdata) | ||
| 575 | { | ||
| 576 | struct samsung_pin_ctrl *ctrl = drvdata->ctrl; | ||
| 577 | struct samsung_pin_bank *bank = ctrl->pin_banks; | ||
| 578 | int i; | ||
| 579 | |||
| 580 | for (i = 0; i < ctrl->nr_banks; ++i, ++bank) | ||
| 581 | if (bank->eint_type == EINT_TYPE_GPIO) | ||
| 582 | exynos_pinctrl_suspend_bank(drvdata, bank); | ||
| 583 | } | ||
| 584 | |||
| 585 | static void exynos_pinctrl_resume_bank( | ||
| 586 | struct samsung_pinctrl_drv_data *drvdata, | ||
| 587 | struct samsung_pin_bank *bank) | ||
| 588 | { | ||
| 589 | struct exynos_eint_gpio_save *save = bank->soc_priv; | ||
| 590 | void __iomem *regs = drvdata->virt_base; | ||
| 591 | |||
| 592 | pr_debug("%s: con %#010x => %#010x\n", bank->name, | ||
| 593 | readl(regs + EXYNOS_GPIO_ECON_OFFSET | ||
| 594 | + bank->eint_offset), save->eint_con); | ||
| 595 | pr_debug("%s: fltcon0 %#010x => %#010x\n", bank->name, | ||
| 596 | readl(regs + EXYNOS_GPIO_EFLTCON_OFFSET | ||
| 597 | + 2 * bank->eint_offset), save->eint_fltcon0); | ||
| 598 | pr_debug("%s: fltcon1 %#010x => %#010x\n", bank->name, | ||
| 599 | readl(regs + EXYNOS_GPIO_EFLTCON_OFFSET | ||
| 600 | + 2 * bank->eint_offset + 4), save->eint_fltcon1); | ||
| 601 | |||
| 602 | writel(save->eint_con, regs + EXYNOS_GPIO_ECON_OFFSET | ||
| 603 | + bank->eint_offset); | ||
| 604 | writel(save->eint_fltcon0, regs + EXYNOS_GPIO_EFLTCON_OFFSET | ||
| 605 | + 2 * bank->eint_offset); | ||
| 606 | writel(save->eint_fltcon1, regs + EXYNOS_GPIO_EFLTCON_OFFSET | ||
| 607 | + 2 * bank->eint_offset + 4); | ||
| 608 | } | ||
| 609 | |||
| 610 | static void exynos_pinctrl_resume(struct samsung_pinctrl_drv_data *drvdata) | ||
| 611 | { | ||
| 612 | struct samsung_pin_ctrl *ctrl = drvdata->ctrl; | ||
| 613 | struct samsung_pin_bank *bank = ctrl->pin_banks; | ||
| 614 | int i; | ||
| 615 | |||
| 616 | for (i = 0; i < ctrl->nr_banks; ++i, ++bank) | ||
| 617 | if (bank->eint_type == EINT_TYPE_GPIO) | ||
| 618 | exynos_pinctrl_resume_bank(drvdata, bank); | ||
| 619 | } | ||
| 620 | |||
| 508 | /* pin banks of exynos4210 pin-controller 0 */ | 621 | /* pin banks of exynos4210 pin-controller 0 */ |
| 509 | static struct samsung_pin_bank exynos4210_pin_banks0[] = { | 622 | static struct samsung_pin_bank exynos4210_pin_banks0[] = { |
| 510 | EXYNOS_PIN_BANK_EINTG(8, 0x000, "gpa0", 0x00), | 623 | EXYNOS_PIN_BANK_EINTG(8, 0x000, "gpa0", 0x00), |
| @@ -568,6 +681,8 @@ struct samsung_pin_ctrl exynos4210_pin_ctrl[] = { | |||
| 568 | .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, | 681 | .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, |
| 569 | .svc = EXYNOS_SVC_OFFSET, | 682 | .svc = EXYNOS_SVC_OFFSET, |
| 570 | .eint_gpio_init = exynos_eint_gpio_init, | 683 | .eint_gpio_init = exynos_eint_gpio_init, |
| 684 | .suspend = exynos_pinctrl_suspend, | ||
| 685 | .resume = exynos_pinctrl_resume, | ||
| 571 | .label = "exynos4210-gpio-ctrl0", | 686 | .label = "exynos4210-gpio-ctrl0", |
| 572 | }, { | 687 | }, { |
| 573 | /* pin-controller instance 1 data */ | 688 | /* pin-controller instance 1 data */ |
| @@ -582,6 +697,8 @@ struct samsung_pin_ctrl exynos4210_pin_ctrl[] = { | |||
| 582 | .svc = EXYNOS_SVC_OFFSET, | 697 | .svc = EXYNOS_SVC_OFFSET, |
| 583 | .eint_gpio_init = exynos_eint_gpio_init, | 698 | .eint_gpio_init = exynos_eint_gpio_init, |
| 584 | .eint_wkup_init = exynos_eint_wkup_init, | 699 | .eint_wkup_init = exynos_eint_wkup_init, |
| 700 | .suspend = exynos_pinctrl_suspend, | ||
| 701 | .resume = exynos_pinctrl_resume, | ||
| 585 | .label = "exynos4210-gpio-ctrl1", | 702 | .label = "exynos4210-gpio-ctrl1", |
| 586 | }, { | 703 | }, { |
| 587 | /* pin-controller instance 2 data */ | 704 | /* pin-controller instance 2 data */ |
| @@ -663,6 +780,8 @@ struct samsung_pin_ctrl exynos4x12_pin_ctrl[] = { | |||
| 663 | .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, | 780 | .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, |
| 664 | .svc = EXYNOS_SVC_OFFSET, | 781 | .svc = EXYNOS_SVC_OFFSET, |
| 665 | .eint_gpio_init = exynos_eint_gpio_init, | 782 | .eint_gpio_init = exynos_eint_gpio_init, |
| 783 | .suspend = exynos_pinctrl_suspend, | ||
| 784 | .resume = exynos_pinctrl_resume, | ||
| 666 | .label = "exynos4x12-gpio-ctrl0", | 785 | .label = "exynos4x12-gpio-ctrl0", |
| 667 | }, { | 786 | }, { |
| 668 | /* pin-controller instance 1 data */ | 787 | /* pin-controller instance 1 data */ |
| @@ -677,6 +796,8 @@ struct samsung_pin_ctrl exynos4x12_pin_ctrl[] = { | |||
| 677 | .svc = EXYNOS_SVC_OFFSET, | 796 | .svc = EXYNOS_SVC_OFFSET, |
| 678 | .eint_gpio_init = exynos_eint_gpio_init, | 797 | .eint_gpio_init = exynos_eint_gpio_init, |
| 679 | .eint_wkup_init = exynos_eint_wkup_init, | 798 | .eint_wkup_init = exynos_eint_wkup_init, |
| 799 | .suspend = exynos_pinctrl_suspend, | ||
| 800 | .resume = exynos_pinctrl_resume, | ||
| 680 | .label = "exynos4x12-gpio-ctrl1", | 801 | .label = "exynos4x12-gpio-ctrl1", |
| 681 | }, { | 802 | }, { |
| 682 | /* pin-controller instance 2 data */ | 803 | /* pin-controller instance 2 data */ |
| @@ -687,6 +808,8 @@ struct samsung_pin_ctrl exynos4x12_pin_ctrl[] = { | |||
| 687 | .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, | 808 | .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, |
| 688 | .svc = EXYNOS_SVC_OFFSET, | 809 | .svc = EXYNOS_SVC_OFFSET, |
| 689 | .eint_gpio_init = exynos_eint_gpio_init, | 810 | .eint_gpio_init = exynos_eint_gpio_init, |
| 811 | .suspend = exynos_pinctrl_suspend, | ||
| 812 | .resume = exynos_pinctrl_resume, | ||
| 690 | .label = "exynos4x12-gpio-ctrl2", | 813 | .label = "exynos4x12-gpio-ctrl2", |
| 691 | }, { | 814 | }, { |
| 692 | /* pin-controller instance 3 data */ | 815 | /* pin-controller instance 3 data */ |
| @@ -697,6 +820,8 @@ struct samsung_pin_ctrl exynos4x12_pin_ctrl[] = { | |||
| 697 | .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, | 820 | .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, |
| 698 | .svc = EXYNOS_SVC_OFFSET, | 821 | .svc = EXYNOS_SVC_OFFSET, |
| 699 | .eint_gpio_init = exynos_eint_gpio_init, | 822 | .eint_gpio_init = exynos_eint_gpio_init, |
| 823 | .suspend = exynos_pinctrl_suspend, | ||
| 824 | .resume = exynos_pinctrl_resume, | ||
| 700 | .label = "exynos4x12-gpio-ctrl3", | 825 | .label = "exynos4x12-gpio-ctrl3", |
| 701 | }, | 826 | }, |
| 702 | }; | 827 | }; |
| @@ -775,6 +900,8 @@ struct samsung_pin_ctrl exynos5250_pin_ctrl[] = { | |||
| 775 | .svc = EXYNOS_SVC_OFFSET, | 900 | .svc = EXYNOS_SVC_OFFSET, |
| 776 | .eint_gpio_init = exynos_eint_gpio_init, | 901 | .eint_gpio_init = exynos_eint_gpio_init, |
| 777 | .eint_wkup_init = exynos_eint_wkup_init, | 902 | .eint_wkup_init = exynos_eint_wkup_init, |
| 903 | .suspend = exynos_pinctrl_suspend, | ||
| 904 | .resume = exynos_pinctrl_resume, | ||
| 778 | .label = "exynos5250-gpio-ctrl0", | 905 | .label = "exynos5250-gpio-ctrl0", |
| 779 | }, { | 906 | }, { |
| 780 | /* pin-controller instance 1 data */ | 907 | /* pin-controller instance 1 data */ |
| @@ -785,6 +912,8 @@ struct samsung_pin_ctrl exynos5250_pin_ctrl[] = { | |||
| 785 | .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, | 912 | .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, |
| 786 | .svc = EXYNOS_SVC_OFFSET, | 913 | .svc = EXYNOS_SVC_OFFSET, |
| 787 | .eint_gpio_init = exynos_eint_gpio_init, | 914 | .eint_gpio_init = exynos_eint_gpio_init, |
| 915 | .suspend = exynos_pinctrl_suspend, | ||
| 916 | .resume = exynos_pinctrl_resume, | ||
| 788 | .label = "exynos5250-gpio-ctrl1", | 917 | .label = "exynos5250-gpio-ctrl1", |
| 789 | }, { | 918 | }, { |
| 790 | /* pin-controller instance 2 data */ | 919 | /* pin-controller instance 2 data */ |
| @@ -795,6 +924,8 @@ struct samsung_pin_ctrl exynos5250_pin_ctrl[] = { | |||
| 795 | .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, | 924 | .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, |
| 796 | .svc = EXYNOS_SVC_OFFSET, | 925 | .svc = EXYNOS_SVC_OFFSET, |
| 797 | .eint_gpio_init = exynos_eint_gpio_init, | 926 | .eint_gpio_init = exynos_eint_gpio_init, |
| 927 | .suspend = exynos_pinctrl_suspend, | ||
| 928 | .resume = exynos_pinctrl_resume, | ||
| 798 | .label = "exynos5250-gpio-ctrl2", | 929 | .label = "exynos5250-gpio-ctrl2", |
| 799 | }, { | 930 | }, { |
| 800 | /* pin-controller instance 3 data */ | 931 | /* pin-controller instance 3 data */ |
| @@ -805,6 +936,8 @@ struct samsung_pin_ctrl exynos5250_pin_ctrl[] = { | |||
| 805 | .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, | 936 | .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, |
| 806 | .svc = EXYNOS_SVC_OFFSET, | 937 | .svc = EXYNOS_SVC_OFFSET, |
| 807 | .eint_gpio_init = exynos_eint_gpio_init, | 938 | .eint_gpio_init = exynos_eint_gpio_init, |
| 939 | .suspend = exynos_pinctrl_suspend, | ||
| 940 | .resume = exynos_pinctrl_resume, | ||
| 808 | .label = "exynos5250-gpio-ctrl3", | 941 | .label = "exynos5250-gpio-ctrl3", |
| 809 | }, | 942 | }, |
| 810 | }; | 943 | }; |
diff --git a/drivers/pinctrl/pinctrl-exynos.h b/drivers/pinctrl/pinctrl-exynos.h index 9b1f77a5bf0f..3c91c357792f 100644 --- a/drivers/pinctrl/pinctrl-exynos.h +++ b/drivers/pinctrl/pinctrl-exynos.h | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | /* External GPIO and wakeup interrupt related definitions */ | 20 | /* External GPIO and wakeup interrupt related definitions */ |
| 21 | #define EXYNOS_GPIO_ECON_OFFSET 0x700 | 21 | #define EXYNOS_GPIO_ECON_OFFSET 0x700 |
| 22 | #define EXYNOS_GPIO_EFLTCON_OFFSET 0x800 | ||
| 22 | #define EXYNOS_GPIO_EMASK_OFFSET 0x900 | 23 | #define EXYNOS_GPIO_EMASK_OFFSET 0x900 |
| 23 | #define EXYNOS_GPIO_EPEND_OFFSET 0xA00 | 24 | #define EXYNOS_GPIO_EPEND_OFFSET 0xA00 |
| 24 | #define EXYNOS_WKUP_ECON_OFFSET 0xE00 | 25 | #define EXYNOS_WKUP_ECON_OFFSET 0xE00 |
diff --git a/drivers/pinctrl/pinctrl-samsung.c b/drivers/pinctrl/pinctrl-samsung.c index 055d0162098b..63ac22e89678 100644 --- a/drivers/pinctrl/pinctrl-samsung.c +++ b/drivers/pinctrl/pinctrl-samsung.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/gpio.h> | 28 | #include <linux/gpio.h> |
| 29 | #include <linux/irqdomain.h> | 29 | #include <linux/irqdomain.h> |
| 30 | #include <linux/spinlock.h> | 30 | #include <linux/spinlock.h> |
| 31 | #include <linux/syscore_ops.h> | ||
| 31 | 32 | ||
| 32 | #include "core.h" | 33 | #include "core.h" |
| 33 | #include "pinctrl-samsung.h" | 34 | #include "pinctrl-samsung.h" |
| @@ -48,6 +49,9 @@ static struct pin_config { | |||
| 48 | { "samsung,pin-pud-pdn", PINCFG_TYPE_PUD_PDN }, | 49 | { "samsung,pin-pud-pdn", PINCFG_TYPE_PUD_PDN }, |
| 49 | }; | 50 | }; |
| 50 | 51 | ||
| 52 | /* Global list of devices (struct samsung_pinctrl_drv_data) */ | ||
| 53 | LIST_HEAD(drvdata_list); | ||
| 54 | |||
| 51 | static unsigned int pin_base; | 55 | static unsigned int pin_base; |
| 52 | 56 | ||
| 53 | static inline struct samsung_pin_bank *gc_to_pin_bank(struct gpio_chip *gc) | 57 | static inline struct samsung_pin_bank *gc_to_pin_bank(struct gpio_chip *gc) |
| @@ -956,9 +960,151 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) | |||
| 956 | ctrl->eint_wkup_init(drvdata); | 960 | ctrl->eint_wkup_init(drvdata); |
| 957 | 961 | ||
| 958 | platform_set_drvdata(pdev, drvdata); | 962 | platform_set_drvdata(pdev, drvdata); |
| 963 | |||
| 964 | /* Add to the global list */ | ||
| 965 | list_add_tail(&drvdata->node, &drvdata_list); | ||
| 966 | |||
| 959 | return 0; | 967 | return 0; |
| 960 | } | 968 | } |
| 961 | 969 | ||
| 970 | #ifdef CONFIG_PM | ||
| 971 | |||
| 972 | /** | ||
| 973 | * samsung_pinctrl_suspend_dev - save pinctrl state for suspend for a device | ||
| 974 | * | ||
| 975 | * Save data for all banks handled by this device. | ||
| 976 | */ | ||
| 977 | static void samsung_pinctrl_suspend_dev( | ||
| 978 | struct samsung_pinctrl_drv_data *drvdata) | ||
| 979 | { | ||
| 980 | struct samsung_pin_ctrl *ctrl = drvdata->ctrl; | ||
| 981 | void __iomem *virt_base = drvdata->virt_base; | ||
| 982 | int i; | ||
| 983 | |||
| 984 | for (i = 0; i < ctrl->nr_banks; i++) { | ||
| 985 | struct samsung_pin_bank *bank = &ctrl->pin_banks[i]; | ||
| 986 | void __iomem *reg = virt_base + bank->pctl_offset; | ||
| 987 | |||
| 988 | u8 *offs = bank->type->reg_offset; | ||
| 989 | u8 *widths = bank->type->fld_width; | ||
| 990 | enum pincfg_type type; | ||
| 991 | |||
| 992 | /* Registers without a powerdown config aren't lost */ | ||
| 993 | if (!widths[PINCFG_TYPE_CON_PDN]) | ||
| 994 | continue; | ||
| 995 | |||
| 996 | for (type = 0; type < PINCFG_TYPE_NUM; type++) | ||
| 997 | if (widths[type]) | ||
| 998 | bank->pm_save[type] = readl(reg + offs[type]); | ||
| 999 | |||
| 1000 | if (widths[PINCFG_TYPE_FUNC] * bank->nr_pins > 32) { | ||
| 1001 | /* Some banks have two config registers */ | ||
| 1002 | bank->pm_save[PINCFG_TYPE_NUM] = | ||
| 1003 | readl(reg + offs[PINCFG_TYPE_FUNC] + 4); | ||
| 1004 | pr_debug("Save %s @ %p (con %#010x %08x)\n", | ||
| 1005 | bank->name, reg, | ||
| 1006 | bank->pm_save[PINCFG_TYPE_FUNC], | ||
| 1007 | bank->pm_save[PINCFG_TYPE_NUM]); | ||
| 1008 | } else { | ||
| 1009 | pr_debug("Save %s @ %p (con %#010x)\n", bank->name, | ||
| 1010 | reg, bank->pm_save[PINCFG_TYPE_FUNC]); | ||
| 1011 | } | ||
| 1012 | } | ||
| 1013 | |||
| 1014 | if (ctrl->suspend) | ||
| 1015 | ctrl->suspend(drvdata); | ||
| 1016 | } | ||
| 1017 | |||
| 1018 | /** | ||
| 1019 | * samsung_pinctrl_resume_dev - restore pinctrl state from suspend for a device | ||
| 1020 | * | ||
| 1021 | * Restore one of the banks that was saved during suspend. | ||
| 1022 | * | ||
| 1023 | * We don't bother doing anything complicated to avoid glitching lines since | ||
| 1024 | * we're called before pad retention is turned off. | ||
| 1025 | */ | ||
| 1026 | static void samsung_pinctrl_resume_dev(struct samsung_pinctrl_drv_data *drvdata) | ||
| 1027 | { | ||
| 1028 | struct samsung_pin_ctrl *ctrl = drvdata->ctrl; | ||
| 1029 | void __iomem *virt_base = drvdata->virt_base; | ||
| 1030 | int i; | ||
| 1031 | |||
| 1032 | if (ctrl->resume) | ||
| 1033 | ctrl->resume(drvdata); | ||
| 1034 | |||
| 1035 | for (i = 0; i < ctrl->nr_banks; i++) { | ||
| 1036 | struct samsung_pin_bank *bank = &ctrl->pin_banks[i]; | ||
| 1037 | void __iomem *reg = virt_base + bank->pctl_offset; | ||
| 1038 | |||
| 1039 | u8 *offs = bank->type->reg_offset; | ||
| 1040 | u8 *widths = bank->type->fld_width; | ||
| 1041 | enum pincfg_type type; | ||
| 1042 | |||
| 1043 | /* Registers without a powerdown config aren't lost */ | ||
| 1044 | if (!widths[PINCFG_TYPE_CON_PDN]) | ||
| 1045 | continue; | ||
| 1046 | |||
| 1047 | if (widths[PINCFG_TYPE_FUNC] * bank->nr_pins > 32) { | ||
| 1048 | /* Some banks have two config registers */ | ||
| 1049 | pr_debug("%s @ %p (con %#010x %08x => %#010x %08x)\n", | ||
| 1050 | bank->name, reg, | ||
| 1051 | readl(reg + offs[PINCFG_TYPE_FUNC]), | ||
| 1052 | readl(reg + offs[PINCFG_TYPE_FUNC] + 4), | ||
| 1053 | bank->pm_save[PINCFG_TYPE_FUNC], | ||
| 1054 | bank->pm_save[PINCFG_TYPE_NUM]); | ||
| 1055 | writel(bank->pm_save[PINCFG_TYPE_NUM], | ||
| 1056 | reg + offs[PINCFG_TYPE_FUNC] + 4); | ||
| 1057 | } else { | ||
| 1058 | pr_debug("%s @ %p (con %#010x => %#010x)\n", bank->name, | ||
| 1059 | reg, readl(reg + offs[PINCFG_TYPE_FUNC]), | ||
| 1060 | bank->pm_save[PINCFG_TYPE_FUNC]); | ||
| 1061 | } | ||
| 1062 | for (type = 0; type < PINCFG_TYPE_NUM; type++) | ||
| 1063 | if (widths[type]) | ||
| 1064 | writel(bank->pm_save[type], reg + offs[type]); | ||
| 1065 | } | ||
| 1066 | } | ||
| 1067 | |||
| 1068 | /** | ||
| 1069 | * samsung_pinctrl_suspend - save pinctrl state for suspend | ||
| 1070 | * | ||
| 1071 | * Save data for all banks across all devices. | ||
| 1072 | */ | ||
| 1073 | static int samsung_pinctrl_suspend(void) | ||
| 1074 | { | ||
| 1075 | struct samsung_pinctrl_drv_data *drvdata; | ||
| 1076 | |||
| 1077 | list_for_each_entry(drvdata, &drvdata_list, node) { | ||
| 1078 | samsung_pinctrl_suspend_dev(drvdata); | ||
| 1079 | } | ||
| 1080 | |||
| 1081 | return 0; | ||
| 1082 | } | ||
| 1083 | |||
| 1084 | /** | ||
| 1085 | * samsung_pinctrl_resume - restore pinctrl state for suspend | ||
| 1086 | * | ||
| 1087 | * Restore data for all banks across all devices. | ||
| 1088 | */ | ||
| 1089 | static void samsung_pinctrl_resume(void) | ||
| 1090 | { | ||
| 1091 | struct samsung_pinctrl_drv_data *drvdata; | ||
| 1092 | |||
| 1093 | list_for_each_entry_reverse(drvdata, &drvdata_list, node) { | ||
| 1094 | samsung_pinctrl_resume_dev(drvdata); | ||
| 1095 | } | ||
| 1096 | } | ||
| 1097 | |||
| 1098 | #else | ||
| 1099 | #define samsung_pinctrl_suspend NULL | ||
| 1100 | #define samsung_pinctrl_resume NULL | ||
| 1101 | #endif | ||
| 1102 | |||
| 1103 | static struct syscore_ops samsung_pinctrl_syscore_ops = { | ||
| 1104 | .suspend = samsung_pinctrl_suspend, | ||
| 1105 | .resume = samsung_pinctrl_resume, | ||
| 1106 | }; | ||
| 1107 | |||
| 962 | static const struct of_device_id samsung_pinctrl_dt_match[] = { | 1108 | static const struct of_device_id samsung_pinctrl_dt_match[] = { |
| 963 | #ifdef CONFIG_PINCTRL_EXYNOS | 1109 | #ifdef CONFIG_PINCTRL_EXYNOS |
| 964 | { .compatible = "samsung,exynos4210-pinctrl", | 1110 | { .compatible = "samsung,exynos4210-pinctrl", |
| @@ -987,6 +1133,14 @@ static struct platform_driver samsung_pinctrl_driver = { | |||
| 987 | 1133 | ||
| 988 | static int __init samsung_pinctrl_drv_register(void) | 1134 | static int __init samsung_pinctrl_drv_register(void) |
| 989 | { | 1135 | { |
| 1136 | /* | ||
| 1137 | * Register syscore ops for save/restore of registers across suspend. | ||
| 1138 | * It's important to ensure that this driver is running at an earlier | ||
| 1139 | * initcall level than any arch-specific init calls that install syscore | ||
| 1140 | * ops that turn off pad retention (like exynos_pm_resume). | ||
| 1141 | */ | ||
| 1142 | register_syscore_ops(&samsung_pinctrl_syscore_ops); | ||
| 1143 | |||
| 990 | return platform_driver_register(&samsung_pinctrl_driver); | 1144 | return platform_driver_register(&samsung_pinctrl_driver); |
| 991 | } | 1145 | } |
| 992 | postcore_initcall(samsung_pinctrl_drv_register); | 1146 | postcore_initcall(samsung_pinctrl_drv_register); |
diff --git a/drivers/pinctrl/pinctrl-samsung.h b/drivers/pinctrl/pinctrl-samsung.h index 7c7f9ebcd05b..26d3519240c9 100644 --- a/drivers/pinctrl/pinctrl-samsung.h +++ b/drivers/pinctrl/pinctrl-samsung.h | |||
| @@ -127,6 +127,7 @@ struct samsung_pin_bank_type { | |||
| 127 | * @gpio_chip: GPIO chip of the bank. | 127 | * @gpio_chip: GPIO chip of the bank. |
| 128 | * @grange: linux gpio pin range supported by this bank. | 128 | * @grange: linux gpio pin range supported by this bank. |
| 129 | * @slock: spinlock protecting bank registers | 129 | * @slock: spinlock protecting bank registers |
| 130 | * @pm_save: saved register values during suspend | ||
| 130 | */ | 131 | */ |
| 131 | struct samsung_pin_bank { | 132 | struct samsung_pin_bank { |
| 132 | struct samsung_pin_bank_type *type; | 133 | struct samsung_pin_bank_type *type; |
| @@ -138,12 +139,15 @@ struct samsung_pin_bank { | |||
| 138 | u32 eint_mask; | 139 | u32 eint_mask; |
| 139 | u32 eint_offset; | 140 | u32 eint_offset; |
| 140 | char *name; | 141 | char *name; |
| 142 | void *soc_priv; | ||
| 141 | struct device_node *of_node; | 143 | struct device_node *of_node; |
| 142 | struct samsung_pinctrl_drv_data *drvdata; | 144 | struct samsung_pinctrl_drv_data *drvdata; |
| 143 | struct irq_domain *irq_domain; | 145 | struct irq_domain *irq_domain; |
| 144 | struct gpio_chip gpio_chip; | 146 | struct gpio_chip gpio_chip; |
| 145 | struct pinctrl_gpio_range grange; | 147 | struct pinctrl_gpio_range grange; |
| 146 | spinlock_t slock; | 148 | spinlock_t slock; |
| 149 | |||
| 150 | u32 pm_save[PINCFG_TYPE_NUM + 1]; /* +1 to handle double CON registers*/ | ||
| 147 | }; | 151 | }; |
| 148 | 152 | ||
| 149 | /** | 153 | /** |
| @@ -184,11 +188,15 @@ struct samsung_pin_ctrl { | |||
| 184 | 188 | ||
| 185 | int (*eint_gpio_init)(struct samsung_pinctrl_drv_data *); | 189 | int (*eint_gpio_init)(struct samsung_pinctrl_drv_data *); |
| 186 | int (*eint_wkup_init)(struct samsung_pinctrl_drv_data *); | 190 | int (*eint_wkup_init)(struct samsung_pinctrl_drv_data *); |
| 191 | void (*suspend)(struct samsung_pinctrl_drv_data *); | ||
| 192 | void (*resume)(struct samsung_pinctrl_drv_data *); | ||
| 193 | |||
| 187 | char *label; | 194 | char *label; |
| 188 | }; | 195 | }; |
| 189 | 196 | ||
| 190 | /** | 197 | /** |
| 191 | * struct samsung_pinctrl_drv_data: wrapper for holding driver data together. | 198 | * struct samsung_pinctrl_drv_data: wrapper for holding driver data together. |
| 199 | * @node: global list node | ||
| 192 | * @virt_base: register base address of the controller. | 200 | * @virt_base: register base address of the controller. |
| 193 | * @dev: device instance representing the controller. | 201 | * @dev: device instance representing the controller. |
| 194 | * @irq: interrpt number used by the controller to notify gpio interrupts. | 202 | * @irq: interrpt number used by the controller to notify gpio interrupts. |
| @@ -201,6 +209,7 @@ struct samsung_pin_ctrl { | |||
| 201 | * @nr_function: number of such pin functions. | 209 | * @nr_function: number of such pin functions. |
| 202 | */ | 210 | */ |
| 203 | struct samsung_pinctrl_drv_data { | 211 | struct samsung_pinctrl_drv_data { |
| 212 | struct list_head node; | ||
| 204 | void __iomem *virt_base; | 213 | void __iomem *virt_base; |
| 205 | struct device *dev; | 214 | struct device *dev; |
| 206 | int irq; | 215 | int irq; |
diff --git a/drivers/pinctrl/pinctrl-sunxi.c b/drivers/pinctrl/pinctrl-sunxi.c index c52fc2c08732..b7d8c890514c 100644 --- a/drivers/pinctrl/pinctrl-sunxi.c +++ b/drivers/pinctrl/pinctrl-sunxi.c | |||
| @@ -1990,8 +1990,10 @@ static int sunxi_pinctrl_probe(struct platform_device *pdev) | |||
| 1990 | } | 1990 | } |
| 1991 | 1991 | ||
| 1992 | clk = devm_clk_get(&pdev->dev, NULL); | 1992 | clk = devm_clk_get(&pdev->dev, NULL); |
| 1993 | if (IS_ERR(clk)) | 1993 | if (IS_ERR(clk)) { |
| 1994 | ret = PTR_ERR(clk); | ||
| 1994 | goto gpiochip_error; | 1995 | goto gpiochip_error; |
| 1996 | } | ||
| 1995 | 1997 | ||
| 1996 | clk_prepare_enable(clk); | 1998 | clk_prepare_enable(clk); |
| 1997 | 1999 | ||
| @@ -2000,7 +2002,8 @@ static int sunxi_pinctrl_probe(struct platform_device *pdev) | |||
| 2000 | return 0; | 2002 | return 0; |
| 2001 | 2003 | ||
| 2002 | gpiochip_error: | 2004 | gpiochip_error: |
| 2003 | ret = gpiochip_remove(pctl->chip); | 2005 | if (gpiochip_remove(pctl->chip)) |
| 2006 | dev_err(&pdev->dev, "failed to remove gpio chip\n"); | ||
| 2004 | pinctrl_error: | 2007 | pinctrl_error: |
| 2005 | pinctrl_unregister(pctl->pctl_dev); | 2008 | pinctrl_unregister(pctl->pctl_dev); |
| 2006 | return ret; | 2009 | return ret; |
diff --git a/drivers/pinctrl/vt8500/pinctrl-wmt.c b/drivers/pinctrl/vt8500/pinctrl-wmt.c index ab63104e8dc9..70d986e04afb 100644 --- a/drivers/pinctrl/vt8500/pinctrl-wmt.c +++ b/drivers/pinctrl/vt8500/pinctrl-wmt.c | |||
| @@ -609,8 +609,7 @@ int wmt_pinctrl_probe(struct platform_device *pdev, | |||
| 609 | return 0; | 609 | return 0; |
| 610 | 610 | ||
| 611 | fail_range: | 611 | fail_range: |
| 612 | err = gpiochip_remove(&data->gpio_chip); | 612 | if (gpiochip_remove(&data->gpio_chip)) |
| 613 | if (err) | ||
| 614 | dev_err(&pdev->dev, "failed to remove gpio chip\n"); | 613 | dev_err(&pdev->dev, "failed to remove gpio chip\n"); |
| 615 | fail_gpio: | 614 | fail_gpio: |
| 616 | pinctrl_unregister(data->pctl_dev); | 615 | pinctrl_unregister(data->pctl_dev); |
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c index d182c96e17ea..7a3870f385f6 100644 --- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c +++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c | |||
| @@ -1370,7 +1370,7 @@ static void tcm_qla2xxx_free_session(struct qla_tgt_sess *sess) | |||
| 1370 | dump_stack(); | 1370 | dump_stack(); |
| 1371 | return; | 1371 | return; |
| 1372 | } | 1372 | } |
| 1373 | target_wait_for_sess_cmds(se_sess, 0); | 1373 | target_wait_for_sess_cmds(se_sess); |
| 1374 | 1374 | ||
| 1375 | transport_deregister_session_configfs(sess->se_sess); | 1375 | transport_deregister_session_configfs(sess->se_sess); |
| 1376 | transport_deregister_session(sess->se_sess); | 1376 | transport_deregister_session(sess->se_sess); |
diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c index db66357211ed..86f0c5d5c116 100644 --- a/drivers/scsi/scsi_proc.c +++ b/drivers/scsi/scsi_proc.c | |||
| @@ -84,6 +84,7 @@ static int proc_scsi_host_open(struct inode *inode, struct file *file) | |||
| 84 | 84 | ||
| 85 | static const struct file_operations proc_scsi_fops = { | 85 | static const struct file_operations proc_scsi_fops = { |
| 86 | .open = proc_scsi_host_open, | 86 | .open = proc_scsi_host_open, |
| 87 | .release = single_release, | ||
| 87 | .read = seq_read, | 88 | .read = seq_read, |
| 88 | .llseek = seq_lseek, | 89 | .llseek = seq_lseek, |
| 89 | .write = proc_scsi_host_write | 90 | .write = proc_scsi_host_write |
diff --git a/drivers/staging/imx-drm/ipuv3-crtc.c b/drivers/staging/imx-drm/ipuv3-crtc.c index ea61c869110f..ff5c63350932 100644 --- a/drivers/staging/imx-drm/ipuv3-crtc.c +++ b/drivers/staging/imx-drm/ipuv3-crtc.c | |||
| @@ -316,31 +316,14 @@ static int ipu_crtc_mode_set(struct drm_crtc *crtc, | |||
| 316 | 316 | ||
| 317 | static void ipu_crtc_handle_pageflip(struct ipu_crtc *ipu_crtc) | 317 | static void ipu_crtc_handle_pageflip(struct ipu_crtc *ipu_crtc) |
| 318 | { | 318 | { |
| 319 | struct drm_pending_vblank_event *e; | ||
| 320 | struct timeval now; | ||
| 321 | unsigned long flags; | 319 | unsigned long flags; |
| 322 | struct drm_device *drm = ipu_crtc->base.dev; | 320 | struct drm_device *drm = ipu_crtc->base.dev; |
| 323 | 321 | ||
| 324 | spin_lock_irqsave(&drm->event_lock, flags); | 322 | spin_lock_irqsave(&drm->event_lock, flags); |
| 325 | 323 | if (ipu_crtc->page_flip_event) | |
| 326 | e = ipu_crtc->page_flip_event; | 324 | drm_send_vblank_event(drm, -1, ipu_crtc->page_flip_event); |
| 327 | if (!e) { | ||
| 328 | spin_unlock_irqrestore(&drm->event_lock, flags); | ||
| 329 | return; | ||
| 330 | } | ||
| 331 | |||
| 332 | do_gettimeofday(&now); | ||
| 333 | e->event.sequence = 0; | ||
| 334 | e->event.tv_sec = now.tv_sec; | ||
| 335 | e->event.tv_usec = now.tv_usec; | ||
| 336 | ipu_crtc->page_flip_event = NULL; | 325 | ipu_crtc->page_flip_event = NULL; |
| 337 | |||
| 338 | imx_drm_crtc_vblank_put(ipu_crtc->imx_crtc); | 326 | imx_drm_crtc_vblank_put(ipu_crtc->imx_crtc); |
| 339 | |||
| 340 | list_add_tail(&e->base.link, &e->base.file_priv->event_list); | ||
| 341 | |||
| 342 | wake_up_interruptible(&e->base.file_priv->event_wait); | ||
| 343 | |||
| 344 | spin_unlock_irqrestore(&drm->event_lock, flags); | 327 | spin_unlock_irqrestore(&drm->event_lock, flags); |
| 345 | } | 328 | } |
| 346 | 329 | ||
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index 262ef1f23b38..d7705e5824fb 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c | |||
| @@ -651,7 +651,7 @@ static int iscsit_add_reject( | |||
| 651 | cmd->buf_ptr = kmemdup(buf, ISCSI_HDR_LEN, GFP_KERNEL); | 651 | cmd->buf_ptr = kmemdup(buf, ISCSI_HDR_LEN, GFP_KERNEL); |
| 652 | if (!cmd->buf_ptr) { | 652 | if (!cmd->buf_ptr) { |
| 653 | pr_err("Unable to allocate memory for cmd->buf_ptr\n"); | 653 | pr_err("Unable to allocate memory for cmd->buf_ptr\n"); |
| 654 | iscsit_release_cmd(cmd); | 654 | iscsit_free_cmd(cmd, false); |
| 655 | return -1; | 655 | return -1; |
| 656 | } | 656 | } |
| 657 | 657 | ||
| @@ -697,7 +697,7 @@ int iscsit_add_reject_from_cmd( | |||
| 697 | cmd->buf_ptr = kmemdup(buf, ISCSI_HDR_LEN, GFP_KERNEL); | 697 | cmd->buf_ptr = kmemdup(buf, ISCSI_HDR_LEN, GFP_KERNEL); |
| 698 | if (!cmd->buf_ptr) { | 698 | if (!cmd->buf_ptr) { |
| 699 | pr_err("Unable to allocate memory for cmd->buf_ptr\n"); | 699 | pr_err("Unable to allocate memory for cmd->buf_ptr\n"); |
| 700 | iscsit_release_cmd(cmd); | 700 | iscsit_free_cmd(cmd, false); |
| 701 | return -1; | 701 | return -1; |
| 702 | } | 702 | } |
| 703 | 703 | ||
| @@ -1743,7 +1743,7 @@ int iscsit_handle_nop_out(struct iscsi_conn *conn, struct iscsi_cmd *cmd, | |||
| 1743 | return 0; | 1743 | return 0; |
| 1744 | out: | 1744 | out: |
| 1745 | if (cmd) | 1745 | if (cmd) |
| 1746 | iscsit_release_cmd(cmd); | 1746 | iscsit_free_cmd(cmd, false); |
| 1747 | ping_out: | 1747 | ping_out: |
| 1748 | kfree(ping_data); | 1748 | kfree(ping_data); |
| 1749 | return ret; | 1749 | return ret; |
| @@ -2251,7 +2251,7 @@ iscsit_handle_logout_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, | |||
| 2251 | if (conn->conn_state != TARG_CONN_STATE_LOGGED_IN) { | 2251 | if (conn->conn_state != TARG_CONN_STATE_LOGGED_IN) { |
| 2252 | pr_err("Received logout request on connection that" | 2252 | pr_err("Received logout request on connection that" |
| 2253 | " is not in logged in state, ignoring request.\n"); | 2253 | " is not in logged in state, ignoring request.\n"); |
| 2254 | iscsit_release_cmd(cmd); | 2254 | iscsit_free_cmd(cmd, false); |
| 2255 | return 0; | 2255 | return 0; |
| 2256 | } | 2256 | } |
| 2257 | 2257 | ||
| @@ -3665,7 +3665,7 @@ iscsit_immediate_queue(struct iscsi_conn *conn, struct iscsi_cmd *cmd, int state | |||
| 3665 | list_del(&cmd->i_conn_node); | 3665 | list_del(&cmd->i_conn_node); |
| 3666 | spin_unlock_bh(&conn->cmd_lock); | 3666 | spin_unlock_bh(&conn->cmd_lock); |
| 3667 | 3667 | ||
| 3668 | iscsit_free_cmd(cmd); | 3668 | iscsit_free_cmd(cmd, false); |
| 3669 | break; | 3669 | break; |
| 3670 | case ISTATE_SEND_NOPIN_WANT_RESPONSE: | 3670 | case ISTATE_SEND_NOPIN_WANT_RESPONSE: |
| 3671 | iscsit_mod_nopin_response_timer(conn); | 3671 | iscsit_mod_nopin_response_timer(conn); |
| @@ -4122,7 +4122,7 @@ static void iscsit_release_commands_from_conn(struct iscsi_conn *conn) | |||
| 4122 | 4122 | ||
| 4123 | iscsit_increment_maxcmdsn(cmd, sess); | 4123 | iscsit_increment_maxcmdsn(cmd, sess); |
| 4124 | 4124 | ||
| 4125 | iscsit_free_cmd(cmd); | 4125 | iscsit_free_cmd(cmd, true); |
| 4126 | 4126 | ||
| 4127 | spin_lock_bh(&conn->cmd_lock); | 4127 | spin_lock_bh(&conn->cmd_lock); |
| 4128 | } | 4128 | } |
diff --git a/drivers/target/iscsi/iscsi_target_erl2.c b/drivers/target/iscsi/iscsi_target_erl2.c index ba6091bf93fc..45a5afd5ea13 100644 --- a/drivers/target/iscsi/iscsi_target_erl2.c +++ b/drivers/target/iscsi/iscsi_target_erl2.c | |||
| @@ -143,7 +143,7 @@ void iscsit_free_connection_recovery_entires(struct iscsi_session *sess) | |||
| 143 | list_del(&cmd->i_conn_node); | 143 | list_del(&cmd->i_conn_node); |
| 144 | cmd->conn = NULL; | 144 | cmd->conn = NULL; |
| 145 | spin_unlock(&cr->conn_recovery_cmd_lock); | 145 | spin_unlock(&cr->conn_recovery_cmd_lock); |
| 146 | iscsit_free_cmd(cmd); | 146 | iscsit_free_cmd(cmd, true); |
| 147 | spin_lock(&cr->conn_recovery_cmd_lock); | 147 | spin_lock(&cr->conn_recovery_cmd_lock); |
| 148 | } | 148 | } |
| 149 | spin_unlock(&cr->conn_recovery_cmd_lock); | 149 | spin_unlock(&cr->conn_recovery_cmd_lock); |
| @@ -165,7 +165,7 @@ void iscsit_free_connection_recovery_entires(struct iscsi_session *sess) | |||
| 165 | list_del(&cmd->i_conn_node); | 165 | list_del(&cmd->i_conn_node); |
| 166 | cmd->conn = NULL; | 166 | cmd->conn = NULL; |
| 167 | spin_unlock(&cr->conn_recovery_cmd_lock); | 167 | spin_unlock(&cr->conn_recovery_cmd_lock); |
| 168 | iscsit_free_cmd(cmd); | 168 | iscsit_free_cmd(cmd, true); |
| 169 | spin_lock(&cr->conn_recovery_cmd_lock); | 169 | spin_lock(&cr->conn_recovery_cmd_lock); |
| 170 | } | 170 | } |
| 171 | spin_unlock(&cr->conn_recovery_cmd_lock); | 171 | spin_unlock(&cr->conn_recovery_cmd_lock); |
| @@ -248,7 +248,7 @@ void iscsit_discard_cr_cmds_by_expstatsn( | |||
| 248 | iscsit_remove_cmd_from_connection_recovery(cmd, sess); | 248 | iscsit_remove_cmd_from_connection_recovery(cmd, sess); |
| 249 | 249 | ||
| 250 | spin_unlock(&cr->conn_recovery_cmd_lock); | 250 | spin_unlock(&cr->conn_recovery_cmd_lock); |
| 251 | iscsit_free_cmd(cmd); | 251 | iscsit_free_cmd(cmd, true); |
| 252 | spin_lock(&cr->conn_recovery_cmd_lock); | 252 | spin_lock(&cr->conn_recovery_cmd_lock); |
| 253 | } | 253 | } |
| 254 | spin_unlock(&cr->conn_recovery_cmd_lock); | 254 | spin_unlock(&cr->conn_recovery_cmd_lock); |
| @@ -302,7 +302,7 @@ int iscsit_discard_unacknowledged_ooo_cmdsns_for_conn(struct iscsi_conn *conn) | |||
| 302 | list_del(&cmd->i_conn_node); | 302 | list_del(&cmd->i_conn_node); |
| 303 | 303 | ||
| 304 | spin_unlock_bh(&conn->cmd_lock); | 304 | spin_unlock_bh(&conn->cmd_lock); |
| 305 | iscsit_free_cmd(cmd); | 305 | iscsit_free_cmd(cmd, true); |
| 306 | spin_lock_bh(&conn->cmd_lock); | 306 | spin_lock_bh(&conn->cmd_lock); |
| 307 | } | 307 | } |
| 308 | spin_unlock_bh(&conn->cmd_lock); | 308 | spin_unlock_bh(&conn->cmd_lock); |
| @@ -355,7 +355,7 @@ int iscsit_prepare_cmds_for_realligance(struct iscsi_conn *conn) | |||
| 355 | 355 | ||
| 356 | list_del(&cmd->i_conn_node); | 356 | list_del(&cmd->i_conn_node); |
| 357 | spin_unlock_bh(&conn->cmd_lock); | 357 | spin_unlock_bh(&conn->cmd_lock); |
| 358 | iscsit_free_cmd(cmd); | 358 | iscsit_free_cmd(cmd, true); |
| 359 | spin_lock_bh(&conn->cmd_lock); | 359 | spin_lock_bh(&conn->cmd_lock); |
| 360 | continue; | 360 | continue; |
| 361 | } | 361 | } |
| @@ -375,7 +375,7 @@ int iscsit_prepare_cmds_for_realligance(struct iscsi_conn *conn) | |||
| 375 | iscsi_sna_gte(cmd->cmd_sn, conn->sess->exp_cmd_sn)) { | 375 | iscsi_sna_gte(cmd->cmd_sn, conn->sess->exp_cmd_sn)) { |
| 376 | list_del(&cmd->i_conn_node); | 376 | list_del(&cmd->i_conn_node); |
| 377 | spin_unlock_bh(&conn->cmd_lock); | 377 | spin_unlock_bh(&conn->cmd_lock); |
| 378 | iscsit_free_cmd(cmd); | 378 | iscsit_free_cmd(cmd, true); |
| 379 | spin_lock_bh(&conn->cmd_lock); | 379 | spin_lock_bh(&conn->cmd_lock); |
| 380 | continue; | 380 | continue; |
| 381 | } | 381 | } |
diff --git a/drivers/target/iscsi/iscsi_target_parameters.c b/drivers/target/iscsi/iscsi_target_parameters.c index c2185fc31136..e38222191a33 100644 --- a/drivers/target/iscsi/iscsi_target_parameters.c +++ b/drivers/target/iscsi/iscsi_target_parameters.c | |||
| @@ -758,9 +758,9 @@ static int iscsi_add_notunderstood_response( | |||
| 758 | } | 758 | } |
| 759 | INIT_LIST_HEAD(&extra_response->er_list); | 759 | INIT_LIST_HEAD(&extra_response->er_list); |
| 760 | 760 | ||
| 761 | strncpy(extra_response->key, key, strlen(key) + 1); | 761 | strlcpy(extra_response->key, key, sizeof(extra_response->key)); |
| 762 | strncpy(extra_response->value, NOTUNDERSTOOD, | 762 | strlcpy(extra_response->value, NOTUNDERSTOOD, |
| 763 | strlen(NOTUNDERSTOOD) + 1); | 763 | sizeof(extra_response->value)); |
| 764 | 764 | ||
| 765 | list_add_tail(&extra_response->er_list, | 765 | list_add_tail(&extra_response->er_list, |
| 766 | ¶m_list->extra_response_list); | 766 | ¶m_list->extra_response_list); |
| @@ -1629,8 +1629,6 @@ int iscsi_decode_text_input( | |||
| 1629 | 1629 | ||
| 1630 | if (phase & PHASE_SECURITY) { | 1630 | if (phase & PHASE_SECURITY) { |
| 1631 | if (iscsi_check_for_auth_key(key) > 0) { | 1631 | if (iscsi_check_for_auth_key(key) > 0) { |
| 1632 | char *tmpptr = key + strlen(key); | ||
| 1633 | *tmpptr = '='; | ||
| 1634 | kfree(tmpbuf); | 1632 | kfree(tmpbuf); |
| 1635 | return 1; | 1633 | return 1; |
| 1636 | } | 1634 | } |
diff --git a/drivers/target/iscsi/iscsi_target_parameters.h b/drivers/target/iscsi/iscsi_target_parameters.h index 915b06798505..a47046a752aa 100644 --- a/drivers/target/iscsi/iscsi_target_parameters.h +++ b/drivers/target/iscsi/iscsi_target_parameters.h | |||
| @@ -1,8 +1,10 @@ | |||
| 1 | #ifndef ISCSI_PARAMETERS_H | 1 | #ifndef ISCSI_PARAMETERS_H |
| 2 | #define ISCSI_PARAMETERS_H | 2 | #define ISCSI_PARAMETERS_H |
| 3 | 3 | ||
| 4 | #include <scsi/iscsi_proto.h> | ||
| 5 | |||
| 4 | struct iscsi_extra_response { | 6 | struct iscsi_extra_response { |
| 5 | char key[64]; | 7 | char key[KEY_MAXLEN]; |
| 6 | char value[32]; | 8 | char value[32]; |
| 7 | struct list_head er_list; | 9 | struct list_head er_list; |
| 8 | } ____cacheline_aligned; | 10 | } ____cacheline_aligned; |
diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c index 2cc6c9a3ffb8..08a3bacef0c5 100644 --- a/drivers/target/iscsi/iscsi_target_util.c +++ b/drivers/target/iscsi/iscsi_target_util.c | |||
| @@ -676,40 +676,56 @@ void iscsit_free_queue_reqs_for_conn(struct iscsi_conn *conn) | |||
| 676 | 676 | ||
| 677 | void iscsit_release_cmd(struct iscsi_cmd *cmd) | 677 | void iscsit_release_cmd(struct iscsi_cmd *cmd) |
| 678 | { | 678 | { |
| 679 | struct iscsi_conn *conn = cmd->conn; | ||
| 680 | |||
| 681 | iscsit_free_r2ts_from_list(cmd); | ||
| 682 | iscsit_free_all_datain_reqs(cmd); | ||
| 683 | |||
| 684 | kfree(cmd->buf_ptr); | 679 | kfree(cmd->buf_ptr); |
| 685 | kfree(cmd->pdu_list); | 680 | kfree(cmd->pdu_list); |
| 686 | kfree(cmd->seq_list); | 681 | kfree(cmd->seq_list); |
| 687 | kfree(cmd->tmr_req); | 682 | kfree(cmd->tmr_req); |
| 688 | kfree(cmd->iov_data); | 683 | kfree(cmd->iov_data); |
| 689 | 684 | ||
| 690 | if (conn) { | 685 | kmem_cache_free(lio_cmd_cache, cmd); |
| 686 | } | ||
| 687 | |||
| 688 | static void __iscsit_free_cmd(struct iscsi_cmd *cmd, bool scsi_cmd, | ||
| 689 | bool check_queues) | ||
| 690 | { | ||
| 691 | struct iscsi_conn *conn = cmd->conn; | ||
| 692 | |||
| 693 | if (scsi_cmd) { | ||
| 694 | if (cmd->data_direction == DMA_TO_DEVICE) { | ||
| 695 | iscsit_stop_dataout_timer(cmd); | ||
| 696 | iscsit_free_r2ts_from_list(cmd); | ||
| 697 | } | ||
| 698 | if (cmd->data_direction == DMA_FROM_DEVICE) | ||
| 699 | iscsit_free_all_datain_reqs(cmd); | ||
| 700 | } | ||
| 701 | |||
| 702 | if (conn && check_queues) { | ||
| 691 | iscsit_remove_cmd_from_immediate_queue(cmd, conn); | 703 | iscsit_remove_cmd_from_immediate_queue(cmd, conn); |
| 692 | iscsit_remove_cmd_from_response_queue(cmd, conn); | 704 | iscsit_remove_cmd_from_response_queue(cmd, conn); |
| 693 | } | 705 | } |
| 694 | |||
| 695 | kmem_cache_free(lio_cmd_cache, cmd); | ||
| 696 | } | 706 | } |
| 697 | 707 | ||
| 698 | void iscsit_free_cmd(struct iscsi_cmd *cmd) | 708 | void iscsit_free_cmd(struct iscsi_cmd *cmd, bool shutdown) |
| 699 | { | 709 | { |
| 710 | struct se_cmd *se_cmd = NULL; | ||
| 711 | int rc; | ||
| 700 | /* | 712 | /* |
| 701 | * Determine if a struct se_cmd is associated with | 713 | * Determine if a struct se_cmd is associated with |
| 702 | * this struct iscsi_cmd. | 714 | * this struct iscsi_cmd. |
| 703 | */ | 715 | */ |
| 704 | switch (cmd->iscsi_opcode) { | 716 | switch (cmd->iscsi_opcode) { |
| 705 | case ISCSI_OP_SCSI_CMD: | 717 | case ISCSI_OP_SCSI_CMD: |
| 706 | if (cmd->data_direction == DMA_TO_DEVICE) | 718 | se_cmd = &cmd->se_cmd; |
| 707 | iscsit_stop_dataout_timer(cmd); | 719 | __iscsit_free_cmd(cmd, true, shutdown); |
| 708 | /* | 720 | /* |
| 709 | * Fallthrough | 721 | * Fallthrough |
| 710 | */ | 722 | */ |
| 711 | case ISCSI_OP_SCSI_TMFUNC: | 723 | case ISCSI_OP_SCSI_TMFUNC: |
| 712 | transport_generic_free_cmd(&cmd->se_cmd, 1); | 724 | rc = transport_generic_free_cmd(&cmd->se_cmd, 1); |
| 725 | if (!rc && shutdown && se_cmd && se_cmd->se_sess) { | ||
| 726 | __iscsit_free_cmd(cmd, true, shutdown); | ||
| 727 | target_put_sess_cmd(se_cmd->se_sess, se_cmd); | ||
| 728 | } | ||
| 713 | break; | 729 | break; |
| 714 | case ISCSI_OP_REJECT: | 730 | case ISCSI_OP_REJECT: |
| 715 | /* | 731 | /* |
| @@ -718,11 +734,19 @@ void iscsit_free_cmd(struct iscsi_cmd *cmd) | |||
| 718 | * associated cmd->se_cmd needs to be released. | 734 | * associated cmd->se_cmd needs to be released. |
| 719 | */ | 735 | */ |
| 720 | if (cmd->se_cmd.se_tfo != NULL) { | 736 | if (cmd->se_cmd.se_tfo != NULL) { |
| 721 | transport_generic_free_cmd(&cmd->se_cmd, 1); | 737 | se_cmd = &cmd->se_cmd; |
| 738 | __iscsit_free_cmd(cmd, true, shutdown); | ||
| 739 | |||
| 740 | rc = transport_generic_free_cmd(&cmd->se_cmd, 1); | ||
| 741 | if (!rc && shutdown && se_cmd->se_sess) { | ||
| 742 | __iscsit_free_cmd(cmd, true, shutdown); | ||
| 743 | target_put_sess_cmd(se_cmd->se_sess, se_cmd); | ||
| 744 | } | ||
| 722 | break; | 745 | break; |
| 723 | } | 746 | } |
| 724 | /* Fall-through */ | 747 | /* Fall-through */ |
| 725 | default: | 748 | default: |
| 749 | __iscsit_free_cmd(cmd, false, shutdown); | ||
| 726 | cmd->release_cmd(cmd); | 750 | cmd->release_cmd(cmd); |
| 727 | break; | 751 | break; |
| 728 | } | 752 | } |
diff --git a/drivers/target/iscsi/iscsi_target_util.h b/drivers/target/iscsi/iscsi_target_util.h index 4f8e01a47081..a4422659d049 100644 --- a/drivers/target/iscsi/iscsi_target_util.h +++ b/drivers/target/iscsi/iscsi_target_util.h | |||
| @@ -29,7 +29,7 @@ extern void iscsit_remove_cmd_from_tx_queues(struct iscsi_cmd *, struct iscsi_co | |||
| 29 | extern bool iscsit_conn_all_queues_empty(struct iscsi_conn *); | 29 | extern bool iscsit_conn_all_queues_empty(struct iscsi_conn *); |
| 30 | extern void iscsit_free_queue_reqs_for_conn(struct iscsi_conn *); | 30 | extern void iscsit_free_queue_reqs_for_conn(struct iscsi_conn *); |
| 31 | extern void iscsit_release_cmd(struct iscsi_cmd *); | 31 | extern void iscsit_release_cmd(struct iscsi_cmd *); |
| 32 | extern void iscsit_free_cmd(struct iscsi_cmd *); | 32 | extern void iscsit_free_cmd(struct iscsi_cmd *, bool); |
| 33 | extern int iscsit_check_session_usage_count(struct iscsi_session *); | 33 | extern int iscsit_check_session_usage_count(struct iscsi_session *); |
| 34 | extern void iscsit_dec_session_usage_count(struct iscsi_session *); | 34 | extern void iscsit_dec_session_usage_count(struct iscsi_session *); |
| 35 | extern void iscsit_inc_session_usage_count(struct iscsi_session *); | 35 | extern void iscsit_inc_session_usage_count(struct iscsi_session *); |
diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c index 1b1d544e927a..b11890d85120 100644 --- a/drivers/target/target_core_file.c +++ b/drivers/target/target_core_file.c | |||
| @@ -153,6 +153,7 @@ static int fd_configure_device(struct se_device *dev) | |||
| 153 | struct request_queue *q = bdev_get_queue(inode->i_bdev); | 153 | struct request_queue *q = bdev_get_queue(inode->i_bdev); |
| 154 | unsigned long long dev_size; | 154 | unsigned long long dev_size; |
| 155 | 155 | ||
| 156 | fd_dev->fd_block_size = bdev_logical_block_size(inode->i_bdev); | ||
| 156 | /* | 157 | /* |
| 157 | * Determine the number of bytes from i_size_read() minus | 158 | * Determine the number of bytes from i_size_read() minus |
| 158 | * one (1) logical sector from underlying struct block_device | 159 | * one (1) logical sector from underlying struct block_device |
| @@ -199,6 +200,7 @@ static int fd_configure_device(struct se_device *dev) | |||
| 199 | goto fail; | 200 | goto fail; |
| 200 | } | 201 | } |
| 201 | 202 | ||
| 203 | fd_dev->fd_block_size = FD_BLOCKSIZE; | ||
| 202 | /* | 204 | /* |
| 203 | * Limit UNMAP emulation to 8k Number of LBAs (NoLB) | 205 | * Limit UNMAP emulation to 8k Number of LBAs (NoLB) |
| 204 | */ | 206 | */ |
| @@ -217,9 +219,7 @@ static int fd_configure_device(struct se_device *dev) | |||
| 217 | dev->dev_attrib.max_write_same_len = 0x1000; | 219 | dev->dev_attrib.max_write_same_len = 0x1000; |
| 218 | } | 220 | } |
| 219 | 221 | ||
| 220 | fd_dev->fd_block_size = dev->dev_attrib.hw_block_size; | 222 | dev->dev_attrib.hw_block_size = fd_dev->fd_block_size; |
| 221 | |||
| 222 | dev->dev_attrib.hw_block_size = FD_BLOCKSIZE; | ||
| 223 | dev->dev_attrib.hw_max_sectors = FD_MAX_SECTORS; | 223 | dev->dev_attrib.hw_max_sectors = FD_MAX_SECTORS; |
| 224 | dev->dev_attrib.hw_queue_depth = FD_MAX_DEVICE_QUEUE_DEPTH; | 224 | dev->dev_attrib.hw_queue_depth = FD_MAX_DEVICE_QUEUE_DEPTH; |
| 225 | 225 | ||
| @@ -694,11 +694,12 @@ static sector_t fd_get_blocks(struct se_device *dev) | |||
| 694 | * to handle underlying block_device resize operations. | 694 | * to handle underlying block_device resize operations. |
| 695 | */ | 695 | */ |
| 696 | if (S_ISBLK(i->i_mode)) | 696 | if (S_ISBLK(i->i_mode)) |
| 697 | dev_size = (i_size_read(i) - fd_dev->fd_block_size); | 697 | dev_size = i_size_read(i); |
| 698 | else | 698 | else |
| 699 | dev_size = fd_dev->fd_dev_size; | 699 | dev_size = fd_dev->fd_dev_size; |
| 700 | 700 | ||
| 701 | return div_u64(dev_size, dev->dev_attrib.block_size); | 701 | return div_u64(dev_size - dev->dev_attrib.block_size, |
| 702 | dev->dev_attrib.block_size); | ||
| 702 | } | 703 | } |
| 703 | 704 | ||
| 704 | static struct sbc_ops fd_sbc_ops = { | 705 | static struct sbc_ops fd_sbc_ops = { |
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 4a793362309d..21e315874a54 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c | |||
| @@ -65,7 +65,7 @@ static void transport_complete_task_attr(struct se_cmd *cmd); | |||
| 65 | static void transport_handle_queue_full(struct se_cmd *cmd, | 65 | static void transport_handle_queue_full(struct se_cmd *cmd, |
| 66 | struct se_device *dev); | 66 | struct se_device *dev); |
| 67 | static int transport_generic_get_mem(struct se_cmd *cmd); | 67 | static int transport_generic_get_mem(struct se_cmd *cmd); |
| 68 | static void transport_put_cmd(struct se_cmd *cmd); | 68 | static int transport_put_cmd(struct se_cmd *cmd); |
| 69 | static void target_complete_ok_work(struct work_struct *work); | 69 | static void target_complete_ok_work(struct work_struct *work); |
| 70 | 70 | ||
| 71 | int init_se_kmem_caches(void) | 71 | int init_se_kmem_caches(void) |
| @@ -221,6 +221,7 @@ struct se_session *transport_init_session(void) | |||
| 221 | INIT_LIST_HEAD(&se_sess->sess_list); | 221 | INIT_LIST_HEAD(&se_sess->sess_list); |
| 222 | INIT_LIST_HEAD(&se_sess->sess_acl_list); | 222 | INIT_LIST_HEAD(&se_sess->sess_acl_list); |
| 223 | INIT_LIST_HEAD(&se_sess->sess_cmd_list); | 223 | INIT_LIST_HEAD(&se_sess->sess_cmd_list); |
| 224 | INIT_LIST_HEAD(&se_sess->sess_wait_list); | ||
| 224 | spin_lock_init(&se_sess->sess_cmd_lock); | 225 | spin_lock_init(&se_sess->sess_cmd_lock); |
| 225 | kref_init(&se_sess->sess_kref); | 226 | kref_init(&se_sess->sess_kref); |
| 226 | 227 | ||
| @@ -1943,7 +1944,7 @@ static inline void transport_free_pages(struct se_cmd *cmd) | |||
| 1943 | * This routine unconditionally frees a command, and reference counting | 1944 | * This routine unconditionally frees a command, and reference counting |
| 1944 | * or list removal must be done in the caller. | 1945 | * or list removal must be done in the caller. |
| 1945 | */ | 1946 | */ |
| 1946 | static void transport_release_cmd(struct se_cmd *cmd) | 1947 | static int transport_release_cmd(struct se_cmd *cmd) |
| 1947 | { | 1948 | { |
| 1948 | BUG_ON(!cmd->se_tfo); | 1949 | BUG_ON(!cmd->se_tfo); |
| 1949 | 1950 | ||
| @@ -1955,11 +1956,11 @@ static void transport_release_cmd(struct se_cmd *cmd) | |||
| 1955 | * If this cmd has been setup with target_get_sess_cmd(), drop | 1956 | * If this cmd has been setup with target_get_sess_cmd(), drop |
| 1956 | * the kref and call ->release_cmd() in kref callback. | 1957 | * the kref and call ->release_cmd() in kref callback. |
| 1957 | */ | 1958 | */ |
| 1958 | if (cmd->check_release != 0) { | 1959 | if (cmd->check_release != 0) |
| 1959 | target_put_sess_cmd(cmd->se_sess, cmd); | 1960 | return target_put_sess_cmd(cmd->se_sess, cmd); |
| 1960 | return; | 1961 | |
| 1961 | } | ||
| 1962 | cmd->se_tfo->release_cmd(cmd); | 1962 | cmd->se_tfo->release_cmd(cmd); |
| 1963 | return 1; | ||
| 1963 | } | 1964 | } |
| 1964 | 1965 | ||
| 1965 | /** | 1966 | /** |
| @@ -1968,7 +1969,7 @@ static void transport_release_cmd(struct se_cmd *cmd) | |||
| 1968 | * | 1969 | * |
| 1969 | * This routine releases our reference to the command and frees it if possible. | 1970 | * This routine releases our reference to the command and frees it if possible. |
| 1970 | */ | 1971 | */ |
| 1971 | static void transport_put_cmd(struct se_cmd *cmd) | 1972 | static int transport_put_cmd(struct se_cmd *cmd) |
| 1972 | { | 1973 | { |
| 1973 | unsigned long flags; | 1974 | unsigned long flags; |
| 1974 | 1975 | ||
| @@ -1976,7 +1977,7 @@ static void transport_put_cmd(struct se_cmd *cmd) | |||
| 1976 | if (atomic_read(&cmd->t_fe_count) && | 1977 | if (atomic_read(&cmd->t_fe_count) && |
| 1977 | !atomic_dec_and_test(&cmd->t_fe_count)) { | 1978 | !atomic_dec_and_test(&cmd->t_fe_count)) { |
| 1978 | spin_unlock_irqrestore(&cmd->t_state_lock, flags); | 1979 | spin_unlock_irqrestore(&cmd->t_state_lock, flags); |
| 1979 | return; | 1980 | return 0; |
| 1980 | } | 1981 | } |
| 1981 | 1982 | ||
| 1982 | if (cmd->transport_state & CMD_T_DEV_ACTIVE) { | 1983 | if (cmd->transport_state & CMD_T_DEV_ACTIVE) { |
| @@ -1986,8 +1987,7 @@ static void transport_put_cmd(struct se_cmd *cmd) | |||
| 1986 | spin_unlock_irqrestore(&cmd->t_state_lock, flags); | 1987 | spin_unlock_irqrestore(&cmd->t_state_lock, flags); |
| 1987 | 1988 | ||
| 1988 | transport_free_pages(cmd); | 1989 | transport_free_pages(cmd); |
| 1989 | transport_release_cmd(cmd); | 1990 | return transport_release_cmd(cmd); |
| 1990 | return; | ||
| 1991 | } | 1991 | } |
| 1992 | 1992 | ||
| 1993 | void *transport_kmap_data_sg(struct se_cmd *cmd) | 1993 | void *transport_kmap_data_sg(struct se_cmd *cmd) |
| @@ -2152,13 +2152,15 @@ static void transport_write_pending_qf(struct se_cmd *cmd) | |||
| 2152 | } | 2152 | } |
| 2153 | } | 2153 | } |
| 2154 | 2154 | ||
| 2155 | void transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks) | 2155 | int transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks) |
| 2156 | { | 2156 | { |
| 2157 | int ret = 0; | ||
| 2158 | |||
| 2157 | if (!(cmd->se_cmd_flags & SCF_SE_LUN_CMD)) { | 2159 | if (!(cmd->se_cmd_flags & SCF_SE_LUN_CMD)) { |
| 2158 | if (wait_for_tasks && (cmd->se_cmd_flags & SCF_SCSI_TMR_CDB)) | 2160 | if (wait_for_tasks && (cmd->se_cmd_flags & SCF_SCSI_TMR_CDB)) |
| 2159 | transport_wait_for_tasks(cmd); | 2161 | transport_wait_for_tasks(cmd); |
| 2160 | 2162 | ||
| 2161 | transport_release_cmd(cmd); | 2163 | ret = transport_release_cmd(cmd); |
| 2162 | } else { | 2164 | } else { |
| 2163 | if (wait_for_tasks) | 2165 | if (wait_for_tasks) |
| 2164 | transport_wait_for_tasks(cmd); | 2166 | transport_wait_for_tasks(cmd); |
| @@ -2166,8 +2168,9 @@ void transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks) | |||
| 2166 | if (cmd->se_lun) | 2168 | if (cmd->se_lun) |
| 2167 | transport_lun_remove_cmd(cmd); | 2169 | transport_lun_remove_cmd(cmd); |
| 2168 | 2170 | ||
| 2169 | transport_put_cmd(cmd); | 2171 | ret = transport_put_cmd(cmd); |
| 2170 | } | 2172 | } |
| 2173 | return ret; | ||
| 2171 | } | 2174 | } |
| 2172 | EXPORT_SYMBOL(transport_generic_free_cmd); | 2175 | EXPORT_SYMBOL(transport_generic_free_cmd); |
| 2173 | 2176 | ||
| @@ -2250,11 +2253,14 @@ void target_sess_cmd_list_set_waiting(struct se_session *se_sess) | |||
| 2250 | unsigned long flags; | 2253 | unsigned long flags; |
| 2251 | 2254 | ||
| 2252 | spin_lock_irqsave(&se_sess->sess_cmd_lock, flags); | 2255 | spin_lock_irqsave(&se_sess->sess_cmd_lock, flags); |
| 2253 | 2256 | if (se_sess->sess_tearing_down) { | |
| 2254 | WARN_ON(se_sess->sess_tearing_down); | 2257 | spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags); |
| 2258 | return; | ||
| 2259 | } | ||
| 2255 | se_sess->sess_tearing_down = 1; | 2260 | se_sess->sess_tearing_down = 1; |
| 2261 | list_splice_init(&se_sess->sess_cmd_list, &se_sess->sess_wait_list); | ||
| 2256 | 2262 | ||
| 2257 | list_for_each_entry(se_cmd, &se_sess->sess_cmd_list, se_cmd_list) | 2263 | list_for_each_entry(se_cmd, &se_sess->sess_wait_list, se_cmd_list) |
| 2258 | se_cmd->cmd_wait_set = 1; | 2264 | se_cmd->cmd_wait_set = 1; |
| 2259 | 2265 | ||
| 2260 | spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags); | 2266 | spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags); |
| @@ -2263,44 +2269,32 @@ EXPORT_SYMBOL(target_sess_cmd_list_set_waiting); | |||
| 2263 | 2269 | ||
| 2264 | /* target_wait_for_sess_cmds - Wait for outstanding descriptors | 2270 | /* target_wait_for_sess_cmds - Wait for outstanding descriptors |
| 2265 | * @se_sess: session to wait for active I/O | 2271 | * @se_sess: session to wait for active I/O |
| 2266 | * @wait_for_tasks: Make extra transport_wait_for_tasks call | ||
| 2267 | */ | 2272 | */ |
| 2268 | void target_wait_for_sess_cmds( | 2273 | void target_wait_for_sess_cmds(struct se_session *se_sess) |
| 2269 | struct se_session *se_sess, | ||
| 2270 | int wait_for_tasks) | ||
| 2271 | { | 2274 | { |
| 2272 | struct se_cmd *se_cmd, *tmp_cmd; | 2275 | struct se_cmd *se_cmd, *tmp_cmd; |
| 2273 | bool rc = false; | 2276 | unsigned long flags; |
| 2274 | 2277 | ||
| 2275 | list_for_each_entry_safe(se_cmd, tmp_cmd, | 2278 | list_for_each_entry_safe(se_cmd, tmp_cmd, |
| 2276 | &se_sess->sess_cmd_list, se_cmd_list) { | 2279 | &se_sess->sess_wait_list, se_cmd_list) { |
| 2277 | list_del(&se_cmd->se_cmd_list); | 2280 | list_del(&se_cmd->se_cmd_list); |
| 2278 | 2281 | ||
| 2279 | pr_debug("Waiting for se_cmd: %p t_state: %d, fabric state:" | 2282 | pr_debug("Waiting for se_cmd: %p t_state: %d, fabric state:" |
| 2280 | " %d\n", se_cmd, se_cmd->t_state, | 2283 | " %d\n", se_cmd, se_cmd->t_state, |
| 2281 | se_cmd->se_tfo->get_cmd_state(se_cmd)); | 2284 | se_cmd->se_tfo->get_cmd_state(se_cmd)); |
| 2282 | 2285 | ||
| 2283 | if (wait_for_tasks) { | 2286 | wait_for_completion(&se_cmd->cmd_wait_comp); |
| 2284 | pr_debug("Calling transport_wait_for_tasks se_cmd: %p t_state: %d," | 2287 | pr_debug("After cmd_wait_comp: se_cmd: %p t_state: %d" |
| 2285 | " fabric state: %d\n", se_cmd, se_cmd->t_state, | 2288 | " fabric state: %d\n", se_cmd, se_cmd->t_state, |
| 2286 | se_cmd->se_tfo->get_cmd_state(se_cmd)); | 2289 | se_cmd->se_tfo->get_cmd_state(se_cmd)); |
| 2287 | |||
| 2288 | rc = transport_wait_for_tasks(se_cmd); | ||
| 2289 | |||
| 2290 | pr_debug("After transport_wait_for_tasks se_cmd: %p t_state: %d," | ||
| 2291 | " fabric state: %d\n", se_cmd, se_cmd->t_state, | ||
| 2292 | se_cmd->se_tfo->get_cmd_state(se_cmd)); | ||
| 2293 | } | ||
| 2294 | |||
| 2295 | if (!rc) { | ||
| 2296 | wait_for_completion(&se_cmd->cmd_wait_comp); | ||
| 2297 | pr_debug("After cmd_wait_comp: se_cmd: %p t_state: %d" | ||
| 2298 | " fabric state: %d\n", se_cmd, se_cmd->t_state, | ||
| 2299 | se_cmd->se_tfo->get_cmd_state(se_cmd)); | ||
| 2300 | } | ||
| 2301 | 2290 | ||
| 2302 | se_cmd->se_tfo->release_cmd(se_cmd); | 2291 | se_cmd->se_tfo->release_cmd(se_cmd); |
| 2303 | } | 2292 | } |
| 2293 | |||
| 2294 | spin_lock_irqsave(&se_sess->sess_cmd_lock, flags); | ||
| 2295 | WARN_ON(!list_empty(&se_sess->sess_cmd_list)); | ||
| 2296 | spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags); | ||
| 2297 | |||
| 2304 | } | 2298 | } |
| 2305 | EXPORT_SYMBOL(target_wait_for_sess_cmds); | 2299 | EXPORT_SYMBOL(target_wait_for_sess_cmds); |
| 2306 | 2300 | ||
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 540909de6247..effdb373b8db 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c | |||
| @@ -223,8 +223,14 @@ static void init_backlight(struct atmel_lcdfb_info *sinfo) | |||
| 223 | 223 | ||
| 224 | static void exit_backlight(struct atmel_lcdfb_info *sinfo) | 224 | static void exit_backlight(struct atmel_lcdfb_info *sinfo) |
| 225 | { | 225 | { |
| 226 | if (sinfo->backlight) | 226 | if (!sinfo->backlight) |
| 227 | backlight_device_unregister(sinfo->backlight); | 227 | return; |
| 228 | |||
| 229 | if (sinfo->backlight->ops) { | ||
| 230 | sinfo->backlight->props.power = FB_BLANK_POWERDOWN; | ||
| 231 | sinfo->backlight->ops->update_status(sinfo->backlight); | ||
| 232 | } | ||
| 233 | backlight_device_unregister(sinfo->backlight); | ||
| 228 | } | 234 | } |
| 229 | 235 | ||
| 230 | #else | 236 | #else |
| @@ -461,8 +467,11 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var, | |||
| 461 | if (info->fix.smem_len) { | 467 | if (info->fix.smem_len) { |
| 462 | unsigned int smem_len = (var->xres_virtual * var->yres_virtual | 468 | unsigned int smem_len = (var->xres_virtual * var->yres_virtual |
| 463 | * ((var->bits_per_pixel + 7) / 8)); | 469 | * ((var->bits_per_pixel + 7) / 8)); |
| 464 | if (smem_len > info->fix.smem_len) | 470 | if (smem_len > info->fix.smem_len) { |
| 471 | dev_err(dev, "Frame buffer is too small (%u) for screen size (need at least %u)\n", | ||
| 472 | info->fix.smem_len, smem_len); | ||
| 465 | return -EINVAL; | 473 | return -EINVAL; |
| 474 | } | ||
| 466 | } | 475 | } |
| 467 | 476 | ||
| 468 | /* Saturate vertical and horizontal timings at maximum values */ | 477 | /* Saturate vertical and horizontal timings at maximum values */ |
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c index 60cc6fee6548..c9c2252e3719 100644 --- a/drivers/video/omap2/dss/core.c +++ b/drivers/video/omap2/dss/core.c | |||
| @@ -53,6 +53,8 @@ static char *def_disp_name; | |||
| 53 | module_param_named(def_disp, def_disp_name, charp, 0); | 53 | module_param_named(def_disp, def_disp_name, charp, 0); |
| 54 | MODULE_PARM_DESC(def_disp, "default display name"); | 54 | MODULE_PARM_DESC(def_disp, "default display name"); |
| 55 | 55 | ||
| 56 | static bool dss_initialized; | ||
| 57 | |||
| 56 | const char *omapdss_get_default_display_name(void) | 58 | const char *omapdss_get_default_display_name(void) |
| 57 | { | 59 | { |
| 58 | return core.default_display_name; | 60 | return core.default_display_name; |
| @@ -66,6 +68,12 @@ enum omapdss_version omapdss_get_version(void) | |||
| 66 | } | 68 | } |
| 67 | EXPORT_SYMBOL(omapdss_get_version); | 69 | EXPORT_SYMBOL(omapdss_get_version); |
| 68 | 70 | ||
| 71 | bool omapdss_is_initialized(void) | ||
| 72 | { | ||
| 73 | return dss_initialized; | ||
| 74 | } | ||
| 75 | EXPORT_SYMBOL(omapdss_is_initialized); | ||
| 76 | |||
| 69 | struct platform_device *dss_get_core_pdev(void) | 77 | struct platform_device *dss_get_core_pdev(void) |
| 70 | { | 78 | { |
| 71 | return core.pdev; | 79 | return core.pdev; |
| @@ -603,6 +611,8 @@ static int __init omap_dss_init(void) | |||
| 603 | return r; | 611 | return r; |
| 604 | } | 612 | } |
| 605 | 613 | ||
| 614 | dss_initialized = true; | ||
| 615 | |||
| 606 | return 0; | 616 | return 0; |
| 607 | } | 617 | } |
| 608 | 618 | ||
| @@ -633,7 +643,15 @@ static int __init omap_dss_init(void) | |||
| 633 | 643 | ||
| 634 | static int __init omap_dss_init2(void) | 644 | static int __init omap_dss_init2(void) |
| 635 | { | 645 | { |
| 636 | return omap_dss_register_drivers(); | 646 | int r; |
| 647 | |||
| 648 | r = omap_dss_register_drivers(); | ||
| 649 | if (r) | ||
| 650 | return r; | ||
| 651 | |||
| 652 | dss_initialized = true; | ||
| 653 | |||
| 654 | return 0; | ||
| 637 | } | 655 | } |
| 638 | 656 | ||
| 639 | core_initcall(omap_dss_init); | 657 | core_initcall(omap_dss_init); |
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index c84bb8a4d0c4..856917b33616 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c | |||
| @@ -2416,6 +2416,9 @@ static int omapfb_probe(struct platform_device *pdev) | |||
| 2416 | 2416 | ||
| 2417 | DBG("omapfb_probe\n"); | 2417 | DBG("omapfb_probe\n"); |
| 2418 | 2418 | ||
| 2419 | if (omapdss_is_initialized() == false) | ||
| 2420 | return -EPROBE_DEFER; | ||
| 2421 | |||
| 2419 | if (pdev->num_resources != 0) { | 2422 | if (pdev->num_resources != 0) { |
| 2420 | dev_err(&pdev->dev, "probed for an unknown device\n"); | 2423 | dev_err(&pdev->dev, "probed for an unknown device\n"); |
| 2421 | r = -ENODEV; | 2424 | r = -ENODEV; |
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c index d9f08c653d62..dbfe2c18a434 100644 --- a/drivers/video/ps3fb.c +++ b/drivers/video/ps3fb.c | |||
| @@ -710,7 +710,7 @@ static int ps3fb_mmap(struct fb_info *info, struct vm_area_struct *vma) | |||
| 710 | r = vm_iomap_memory(vma, info->fix.smem_start, info->fix.smem_len); | 710 | r = vm_iomap_memory(vma, info->fix.smem_start, info->fix.smem_len); |
| 711 | 711 | ||
| 712 | dev_dbg(info->device, "ps3fb: mmap framebuffer P(%lx)->V(%lx)\n", | 712 | dev_dbg(info->device, "ps3fb: mmap framebuffer P(%lx)->V(%lx)\n", |
| 713 | info->fix.smem_start + vma->vm_pgoff << PAGE_SHIFT, | 713 | info->fix.smem_start + (vma->vm_pgoff << PAGE_SHIFT), |
| 714 | vma->vm_start); | 714 | vma->vm_start); |
| 715 | 715 | ||
| 716 | return r; | 716 | return r; |
diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c index 18e8bd8fa947..cc072c66c766 100644 --- a/drivers/xen/tmem.c +++ b/drivers/xen/tmem.c | |||
| @@ -41,6 +41,8 @@ module_param(selfballooning, bool, S_IRUGO); | |||
| 41 | #ifdef CONFIG_FRONTSWAP | 41 | #ifdef CONFIG_FRONTSWAP |
| 42 | static bool frontswap __read_mostly = true; | 42 | static bool frontswap __read_mostly = true; |
| 43 | module_param(frontswap, bool, S_IRUGO); | 43 | module_param(frontswap, bool, S_IRUGO); |
| 44 | #else /* CONFIG_FRONTSWAP */ | ||
| 45 | #define frontswap (0) | ||
| 44 | #endif /* CONFIG_FRONTSWAP */ | 46 | #endif /* CONFIG_FRONTSWAP */ |
| 45 | 47 | ||
| 46 | #ifdef CONFIG_XEN_SELFBALLOONING | 48 | #ifdef CONFIG_XEN_SELFBALLOONING |
diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c index a2278ba7fb27..4e8ba38aa0c9 100644 --- a/drivers/xen/xen-pciback/pci_stub.c +++ b/drivers/xen/xen-pciback/pci_stub.c | |||
| @@ -106,7 +106,7 @@ static void pcistub_device_release(struct kref *kref) | |||
| 106 | else | 106 | else |
| 107 | pci_restore_state(dev); | 107 | pci_restore_state(dev); |
| 108 | 108 | ||
| 109 | if (pci_find_capability(dev, PCI_CAP_ID_MSIX)) { | 109 | if (dev->msix_cap) { |
| 110 | struct physdev_pci_device ppdev = { | 110 | struct physdev_pci_device ppdev = { |
| 111 | .seg = pci_domain_nr(dev->bus), | 111 | .seg = pci_domain_nr(dev->bus), |
| 112 | .bus = dev->bus->number, | 112 | .bus = dev->bus->number, |
| @@ -371,7 +371,7 @@ static int pcistub_init_device(struct pci_dev *dev) | |||
| 371 | if (err) | 371 | if (err) |
| 372 | goto config_release; | 372 | goto config_release; |
| 373 | 373 | ||
| 374 | if (pci_find_capability(dev, PCI_CAP_ID_MSIX)) { | 374 | if (dev->msix_cap) { |
| 375 | struct physdev_pci_device ppdev = { | 375 | struct physdev_pci_device ppdev = { |
| 376 | .seg = pci_domain_nr(dev->bus), | 376 | .seg = pci_domain_nr(dev->bus), |
| 377 | .bus = dev->bus->number, | 377 | .bus = dev->bus->number, |
diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c index 61786be9138b..ec097d6f964d 100644 --- a/drivers/xen/xenbus/xenbus_client.c +++ b/drivers/xen/xenbus/xenbus_client.c | |||
| @@ -534,7 +534,7 @@ static int xenbus_map_ring_valloc_hvm(struct xenbus_device *dev, | |||
| 534 | 534 | ||
| 535 | err = xenbus_map_ring(dev, gnt_ref, &node->handle, addr); | 535 | err = xenbus_map_ring(dev, gnt_ref, &node->handle, addr); |
| 536 | if (err) | 536 | if (err) |
| 537 | goto out_err; | 537 | goto out_err_free_ballooned_pages; |
| 538 | 538 | ||
| 539 | spin_lock(&xenbus_valloc_lock); | 539 | spin_lock(&xenbus_valloc_lock); |
| 540 | list_add(&node->next, &xenbus_valloc_pages); | 540 | list_add(&node->next, &xenbus_valloc_pages); |
| @@ -543,8 +543,9 @@ static int xenbus_map_ring_valloc_hvm(struct xenbus_device *dev, | |||
| 543 | *vaddr = addr; | 543 | *vaddr = addr; |
| 544 | return 0; | 544 | return 0; |
| 545 | 545 | ||
| 546 | out_err: | 546 | out_err_free_ballooned_pages: |
| 547 | free_xenballooned_pages(1, &node->page); | 547 | free_xenballooned_pages(1, &node->page); |
| 548 | out_err: | ||
| 548 | kfree(node); | 549 | kfree(node); |
| 549 | return err; | 550 | return err; |
| 550 | } | 551 | } |
diff --git a/drivers/xen/xenbus/xenbus_comms.h b/drivers/xen/xenbus/xenbus_comms.h index c8abd3b8a6c4..e74f9c1fbd80 100644 --- a/drivers/xen/xenbus/xenbus_comms.h +++ b/drivers/xen/xenbus/xenbus_comms.h | |||
| @@ -45,6 +45,7 @@ int xb_wait_for_data_to_read(void); | |||
| 45 | int xs_input_avail(void); | 45 | int xs_input_avail(void); |
| 46 | extern struct xenstore_domain_interface *xen_store_interface; | 46 | extern struct xenstore_domain_interface *xen_store_interface; |
| 47 | extern int xen_store_evtchn; | 47 | extern int xen_store_evtchn; |
| 48 | extern enum xenstore_init xen_store_domain_type; | ||
| 48 | 49 | ||
| 49 | extern const struct file_operations xen_xenbus_fops; | 50 | extern const struct file_operations xen_xenbus_fops; |
| 50 | 51 | ||
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c index 3325884c693f..56cfaaa9d006 100644 --- a/drivers/xen/xenbus/xenbus_probe.c +++ b/drivers/xen/xenbus/xenbus_probe.c | |||
| @@ -69,6 +69,9 @@ EXPORT_SYMBOL_GPL(xen_store_evtchn); | |||
| 69 | struct xenstore_domain_interface *xen_store_interface; | 69 | struct xenstore_domain_interface *xen_store_interface; |
| 70 | EXPORT_SYMBOL_GPL(xen_store_interface); | 70 | EXPORT_SYMBOL_GPL(xen_store_interface); |
| 71 | 71 | ||
| 72 | enum xenstore_init xen_store_domain_type; | ||
| 73 | EXPORT_SYMBOL_GPL(xen_store_domain_type); | ||
| 74 | |||
| 72 | static unsigned long xen_store_mfn; | 75 | static unsigned long xen_store_mfn; |
| 73 | 76 | ||
| 74 | static BLOCKING_NOTIFIER_HEAD(xenstore_chain); | 77 | static BLOCKING_NOTIFIER_HEAD(xenstore_chain); |
| @@ -719,17 +722,11 @@ static int __init xenstored_local_init(void) | |||
| 719 | return err; | 722 | return err; |
| 720 | } | 723 | } |
| 721 | 724 | ||
| 722 | enum xenstore_init { | ||
| 723 | UNKNOWN, | ||
| 724 | PV, | ||
| 725 | HVM, | ||
| 726 | LOCAL, | ||
| 727 | }; | ||
| 728 | static int __init xenbus_init(void) | 725 | static int __init xenbus_init(void) |
| 729 | { | 726 | { |
| 730 | int err = 0; | 727 | int err = 0; |
| 731 | enum xenstore_init usage = UNKNOWN; | ||
| 732 | uint64_t v = 0; | 728 | uint64_t v = 0; |
| 729 | xen_store_domain_type = XS_UNKNOWN; | ||
| 733 | 730 | ||
| 734 | if (!xen_domain()) | 731 | if (!xen_domain()) |
| 735 | return -ENODEV; | 732 | return -ENODEV; |
| @@ -737,29 +734,29 @@ static int __init xenbus_init(void) | |||
| 737 | xenbus_ring_ops_init(); | 734 | xenbus_ring_ops_init(); |
| 738 | 735 | ||
| 739 | if (xen_pv_domain()) | 736 | if (xen_pv_domain()) |
| 740 | usage = PV; | 737 | xen_store_domain_type = XS_PV; |
| 741 | if (xen_hvm_domain()) | 738 | if (xen_hvm_domain()) |
| 742 | usage = HVM; | 739 | xen_store_domain_type = XS_HVM; |
| 743 | if (xen_hvm_domain() && xen_initial_domain()) | 740 | if (xen_hvm_domain() && xen_initial_domain()) |
| 744 | usage = LOCAL; | 741 | xen_store_domain_type = XS_LOCAL; |
| 745 | if (xen_pv_domain() && !xen_start_info->store_evtchn) | 742 | if (xen_pv_domain() && !xen_start_info->store_evtchn) |
| 746 | usage = LOCAL; | 743 | xen_store_domain_type = XS_LOCAL; |
| 747 | if (xen_pv_domain() && xen_start_info->store_evtchn) | 744 | if (xen_pv_domain() && xen_start_info->store_evtchn) |
| 748 | xenstored_ready = 1; | 745 | xenstored_ready = 1; |
| 749 | 746 | ||
| 750 | switch (usage) { | 747 | switch (xen_store_domain_type) { |
| 751 | case LOCAL: | 748 | case XS_LOCAL: |
| 752 | err = xenstored_local_init(); | 749 | err = xenstored_local_init(); |
| 753 | if (err) | 750 | if (err) |
| 754 | goto out_error; | 751 | goto out_error; |
| 755 | xen_store_interface = mfn_to_virt(xen_store_mfn); | 752 | xen_store_interface = mfn_to_virt(xen_store_mfn); |
| 756 | break; | 753 | break; |
| 757 | case PV: | 754 | case XS_PV: |
| 758 | xen_store_evtchn = xen_start_info->store_evtchn; | 755 | xen_store_evtchn = xen_start_info->store_evtchn; |
| 759 | xen_store_mfn = xen_start_info->store_mfn; | 756 | xen_store_mfn = xen_start_info->store_mfn; |
| 760 | xen_store_interface = mfn_to_virt(xen_store_mfn); | 757 | xen_store_interface = mfn_to_virt(xen_store_mfn); |
| 761 | break; | 758 | break; |
| 762 | case HVM: | 759 | case XS_HVM: |
| 763 | err = hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &v); | 760 | err = hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &v); |
| 764 | if (err) | 761 | if (err) |
| 765 | goto out_error; | 762 | goto out_error; |
diff --git a/drivers/xen/xenbus/xenbus_probe.h b/drivers/xen/xenbus/xenbus_probe.h index bb4f92ed8730..146f857a36f8 100644 --- a/drivers/xen/xenbus/xenbus_probe.h +++ b/drivers/xen/xenbus/xenbus_probe.h | |||
| @@ -47,6 +47,13 @@ struct xen_bus_type { | |||
| 47 | struct bus_type bus; | 47 | struct bus_type bus; |
| 48 | }; | 48 | }; |
| 49 | 49 | ||
| 50 | enum xenstore_init { | ||
| 51 | XS_UNKNOWN, | ||
| 52 | XS_PV, | ||
| 53 | XS_HVM, | ||
| 54 | XS_LOCAL, | ||
| 55 | }; | ||
| 56 | |||
| 50 | extern struct device_attribute xenbus_dev_attrs[]; | 57 | extern struct device_attribute xenbus_dev_attrs[]; |
| 51 | 58 | ||
| 52 | extern int xenbus_match(struct device *_dev, struct device_driver *_drv); | 59 | extern int xenbus_match(struct device *_dev, struct device_driver *_drv); |
diff --git a/drivers/xen/xenbus/xenbus_probe_frontend.c b/drivers/xen/xenbus/xenbus_probe_frontend.c index 3159a37d966d..a7e25073de19 100644 --- a/drivers/xen/xenbus/xenbus_probe_frontend.c +++ b/drivers/xen/xenbus/xenbus_probe_frontend.c | |||
| @@ -29,6 +29,8 @@ | |||
| 29 | #include "xenbus_probe.h" | 29 | #include "xenbus_probe.h" |
| 30 | 30 | ||
| 31 | 31 | ||
| 32 | static struct workqueue_struct *xenbus_frontend_wq; | ||
| 33 | |||
| 32 | /* device/<type>/<id> => <type>-<id> */ | 34 | /* device/<type>/<id> => <type>-<id> */ |
| 33 | static int frontend_bus_id(char bus_id[XEN_BUS_ID_SIZE], const char *nodename) | 35 | static int frontend_bus_id(char bus_id[XEN_BUS_ID_SIZE], const char *nodename) |
| 34 | { | 36 | { |
| @@ -89,9 +91,40 @@ static void backend_changed(struct xenbus_watch *watch, | |||
| 89 | xenbus_otherend_changed(watch, vec, len, 1); | 91 | xenbus_otherend_changed(watch, vec, len, 1); |
| 90 | } | 92 | } |
| 91 | 93 | ||
| 94 | static void xenbus_frontend_delayed_resume(struct work_struct *w) | ||
| 95 | { | ||
| 96 | struct xenbus_device *xdev = container_of(w, struct xenbus_device, work); | ||
| 97 | |||
| 98 | xenbus_dev_resume(&xdev->dev); | ||
| 99 | } | ||
| 100 | |||
| 101 | static int xenbus_frontend_dev_resume(struct device *dev) | ||
| 102 | { | ||
| 103 | /* | ||
| 104 | * If xenstored is running in this domain, we cannot access the backend | ||
| 105 | * state at the moment, so we need to defer xenbus_dev_resume | ||
| 106 | */ | ||
| 107 | if (xen_store_domain_type == XS_LOCAL) { | ||
| 108 | struct xenbus_device *xdev = to_xenbus_device(dev); | ||
| 109 | |||
| 110 | if (!xenbus_frontend_wq) { | ||
| 111 | pr_err("%s: no workqueue to process delayed resume\n", | ||
| 112 | xdev->nodename); | ||
| 113 | return -EFAULT; | ||
| 114 | } | ||
| 115 | |||
| 116 | INIT_WORK(&xdev->work, xenbus_frontend_delayed_resume); | ||
| 117 | queue_work(xenbus_frontend_wq, &xdev->work); | ||
| 118 | |||
| 119 | return 0; | ||
| 120 | } | ||
| 121 | |||
| 122 | return xenbus_dev_resume(dev); | ||
| 123 | } | ||
| 124 | |||
| 92 | static const struct dev_pm_ops xenbus_pm_ops = { | 125 | static const struct dev_pm_ops xenbus_pm_ops = { |
| 93 | .suspend = xenbus_dev_suspend, | 126 | .suspend = xenbus_dev_suspend, |
| 94 | .resume = xenbus_dev_resume, | 127 | .resume = xenbus_frontend_dev_resume, |
| 95 | .freeze = xenbus_dev_suspend, | 128 | .freeze = xenbus_dev_suspend, |
| 96 | .thaw = xenbus_dev_cancel, | 129 | .thaw = xenbus_dev_cancel, |
| 97 | .restore = xenbus_dev_resume, | 130 | .restore = xenbus_dev_resume, |
| @@ -440,6 +473,8 @@ static int __init xenbus_probe_frontend_init(void) | |||
| 440 | 473 | ||
| 441 | register_xenstore_notifier(&xenstore_notifier); | 474 | register_xenstore_notifier(&xenstore_notifier); |
| 442 | 475 | ||
| 476 | xenbus_frontend_wq = create_workqueue("xenbus_frontend"); | ||
| 477 | |||
| 443 | return 0; | 478 | return 0; |
| 444 | } | 479 | } |
| 445 | subsys_initcall(xenbus_probe_frontend_init); | 480 | subsys_initcall(xenbus_probe_frontend_init); |
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index 8615ee89ab55..f95dddced968 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c | |||
| @@ -265,8 +265,8 @@ befs_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
| 265 | result = filldir(dirent, keybuf, keysize, filp->f_pos, | 265 | result = filldir(dirent, keybuf, keysize, filp->f_pos, |
| 266 | (ino_t) value, d_type); | 266 | (ino_t) value, d_type); |
| 267 | } | 267 | } |
| 268 | 268 | if (!result) | |
| 269 | filp->f_pos++; | 269 | filp->f_pos++; |
| 270 | 270 | ||
| 271 | befs_debug(sb, "<--- befs_readdir() filp->f_pos %Ld", filp->f_pos); | 271 | befs_debug(sb, "<--- befs_readdir() filp->f_pos %Ld", filp->f_pos); |
| 272 | 272 | ||
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c index 8e33ec65847b..58df174deb10 100644 --- a/fs/cifs/cifs_dfs_ref.c +++ b/fs/cifs/cifs_dfs_ref.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
| 19 | #include <linux/vfs.h> | 19 | #include <linux/vfs.h> |
| 20 | #include <linux/fs.h> | 20 | #include <linux/fs.h> |
| 21 | #include <linux/inet.h> | ||
| 21 | #include "cifsglob.h" | 22 | #include "cifsglob.h" |
| 22 | #include "cifsproto.h" | 23 | #include "cifsproto.h" |
| 23 | #include "cifsfs.h" | 24 | #include "cifsfs.h" |
| @@ -48,58 +49,74 @@ void cifs_dfs_release_automount_timer(void) | |||
| 48 | } | 49 | } |
| 49 | 50 | ||
| 50 | /** | 51 | /** |
| 51 | * cifs_get_share_name - extracts share name from UNC | 52 | * cifs_build_devname - build a devicename from a UNC and optional prepath |
| 52 | * @node_name: pointer to UNC string | 53 | * @nodename: pointer to UNC string |
| 54 | * @prepath: pointer to prefixpath (or NULL if there isn't one) | ||
| 53 | * | 55 | * |
| 54 | * Extracts sharename form full UNC. | 56 | * Build a new cifs devicename after chasing a DFS referral. Allocate a buffer |
| 55 | * i.e. strips from UNC trailing path that is not part of share | 57 | * big enough to hold the final thing. Copy the UNC from the nodename, and |
| 56 | * name and fixup missing '\' in the beginning of DFS node refferal | 58 | * concatenate the prepath onto the end of it if there is one. |
| 57 | * if necessary. | 59 | * |
| 58 | * Returns pointer to share name on success or ERR_PTR on error. | 60 | * Returns pointer to the built string, or a ERR_PTR. Caller is responsible |
| 59 | * Caller is responsible for freeing returned string. | 61 | * for freeing the returned string. |
| 60 | */ | 62 | */ |
| 61 | static char *cifs_get_share_name(const char *node_name) | 63 | static char * |
| 64 | cifs_build_devname(char *nodename, const char *prepath) | ||
| 62 | { | 65 | { |
| 63 | int len; | 66 | size_t pplen; |
| 64 | char *UNC; | 67 | size_t unclen; |
| 65 | char *pSep; | 68 | char *dev; |
| 66 | 69 | char *pos; | |
| 67 | len = strlen(node_name); | 70 | |
| 68 | UNC = kmalloc(len+2 /*for term null and additional \ if it's missed */, | 71 | /* skip over any preceding delimiters */ |
| 69 | GFP_KERNEL); | 72 | nodename += strspn(nodename, "\\"); |
| 70 | if (!UNC) | 73 | if (!*nodename) |
| 71 | return ERR_PTR(-ENOMEM); | 74 | return ERR_PTR(-EINVAL); |
| 72 | 75 | ||
| 73 | /* get share name and server name */ | 76 | /* get length of UNC and set pos to last char */ |
| 74 | if (node_name[1] != '\\') { | 77 | unclen = strlen(nodename); |
| 75 | UNC[0] = '\\'; | 78 | pos = nodename + unclen - 1; |
| 76 | strncpy(UNC+1, node_name, len); | ||
| 77 | len++; | ||
| 78 | UNC[len] = 0; | ||
| 79 | } else { | ||
| 80 | strncpy(UNC, node_name, len); | ||
| 81 | UNC[len] = 0; | ||
| 82 | } | ||
| 83 | 79 | ||
| 84 | /* find server name end */ | 80 | /* trim off any trailing delimiters */ |
| 85 | pSep = memchr(UNC+2, '\\', len-2); | 81 | while (*pos == '\\') { |
| 86 | if (!pSep) { | 82 | --pos; |
| 87 | cifs_dbg(VFS, "%s: no server name end in node name: %s\n", | 83 | --unclen; |
| 88 | __func__, node_name); | ||
| 89 | kfree(UNC); | ||
| 90 | return ERR_PTR(-EINVAL); | ||
| 91 | } | 84 | } |
| 92 | 85 | ||
| 93 | /* find sharename end */ | 86 | /* allocate a buffer: |
| 94 | pSep++; | 87 | * +2 for preceding "//" |
| 95 | pSep = memchr(UNC+(pSep-UNC), '\\', len-(pSep-UNC)); | 88 | * +1 for delimiter between UNC and prepath |
| 96 | if (pSep) { | 89 | * +1 for trailing NULL |
| 97 | /* trim path up to sharename end | 90 | */ |
| 98 | * now we have share name in UNC */ | 91 | pplen = prepath ? strlen(prepath) : 0; |
| 99 | *pSep = 0; | 92 | dev = kmalloc(2 + unclen + 1 + pplen + 1, GFP_KERNEL); |
| 93 | if (!dev) | ||
| 94 | return ERR_PTR(-ENOMEM); | ||
| 95 | |||
| 96 | pos = dev; | ||
| 97 | /* add the initial "//" */ | ||
| 98 | *pos = '/'; | ||
| 99 | ++pos; | ||
| 100 | *pos = '/'; | ||
| 101 | ++pos; | ||
| 102 | |||
| 103 | /* copy in the UNC portion from referral */ | ||
| 104 | memcpy(pos, nodename, unclen); | ||
| 105 | pos += unclen; | ||
| 106 | |||
| 107 | /* copy the prefixpath remainder (if there is one) */ | ||
| 108 | if (pplen) { | ||
| 109 | *pos = '/'; | ||
| 110 | ++pos; | ||
| 111 | memcpy(pos, prepath, pplen); | ||
| 112 | pos += pplen; | ||
| 100 | } | 113 | } |
| 101 | 114 | ||
| 102 | return UNC; | 115 | /* NULL terminator */ |
| 116 | *pos = '\0'; | ||
| 117 | |||
| 118 | convert_delimiter(dev, '/'); | ||
| 119 | return dev; | ||
| 103 | } | 120 | } |
| 104 | 121 | ||
| 105 | 122 | ||
| @@ -123,6 +140,7 @@ char *cifs_compose_mount_options(const char *sb_mountdata, | |||
| 123 | { | 140 | { |
| 124 | int rc; | 141 | int rc; |
| 125 | char *mountdata = NULL; | 142 | char *mountdata = NULL; |
| 143 | const char *prepath = NULL; | ||
| 126 | int md_len; | 144 | int md_len; |
| 127 | char *tkn_e; | 145 | char *tkn_e; |
| 128 | char *srvIP = NULL; | 146 | char *srvIP = NULL; |
| @@ -132,7 +150,10 @@ char *cifs_compose_mount_options(const char *sb_mountdata, | |||
| 132 | if (sb_mountdata == NULL) | 150 | if (sb_mountdata == NULL) |
| 133 | return ERR_PTR(-EINVAL); | 151 | return ERR_PTR(-EINVAL); |
| 134 | 152 | ||
| 135 | *devname = cifs_get_share_name(ref->node_name); | 153 | if (strlen(fullpath) - ref->path_consumed) |
| 154 | prepath = fullpath + ref->path_consumed; | ||
| 155 | |||
| 156 | *devname = cifs_build_devname(ref->node_name, prepath); | ||
| 136 | if (IS_ERR(*devname)) { | 157 | if (IS_ERR(*devname)) { |
| 137 | rc = PTR_ERR(*devname); | 158 | rc = PTR_ERR(*devname); |
| 138 | *devname = NULL; | 159 | *devname = NULL; |
| @@ -146,12 +167,14 @@ char *cifs_compose_mount_options(const char *sb_mountdata, | |||
| 146 | goto compose_mount_options_err; | 167 | goto compose_mount_options_err; |
| 147 | } | 168 | } |
| 148 | 169 | ||
| 149 | /* md_len = strlen(...) + 12 for 'sep+prefixpath=' | 170 | /* |
| 150 | * assuming that we have 'unc=' and 'ip=' in | 171 | * In most cases, we'll be building a shorter string than the original, |
| 151 | * the original sb_mountdata | 172 | * but we do have to assume that the address in the ip= option may be |
| 173 | * much longer than the original. Add the max length of an address | ||
| 174 | * string to the length of the original string to allow for worst case. | ||
| 152 | */ | 175 | */ |
| 153 | md_len = strlen(sb_mountdata) + rc + strlen(ref->node_name) + 12; | 176 | md_len = strlen(sb_mountdata) + INET6_ADDRSTRLEN; |
| 154 | mountdata = kzalloc(md_len+1, GFP_KERNEL); | 177 | mountdata = kzalloc(md_len + 1, GFP_KERNEL); |
| 155 | if (mountdata == NULL) { | 178 | if (mountdata == NULL) { |
| 156 | rc = -ENOMEM; | 179 | rc = -ENOMEM; |
| 157 | goto compose_mount_options_err; | 180 | goto compose_mount_options_err; |
| @@ -195,26 +218,6 @@ char *cifs_compose_mount_options(const char *sb_mountdata, | |||
| 195 | strncat(mountdata, &sep, 1); | 218 | strncat(mountdata, &sep, 1); |
| 196 | strcat(mountdata, "ip="); | 219 | strcat(mountdata, "ip="); |
| 197 | strcat(mountdata, srvIP); | 220 | strcat(mountdata, srvIP); |
| 198 | strncat(mountdata, &sep, 1); | ||
| 199 | strcat(mountdata, "unc="); | ||
| 200 | strcat(mountdata, *devname); | ||
| 201 | |||
| 202 | /* find & copy prefixpath */ | ||
| 203 | tkn_e = strchr(ref->node_name + 2, '\\'); | ||
| 204 | if (tkn_e == NULL) { | ||
| 205 | /* invalid unc, missing share name*/ | ||
| 206 | rc = -EINVAL; | ||
| 207 | goto compose_mount_options_err; | ||
| 208 | } | ||
| 209 | |||
| 210 | tkn_e = strchr(tkn_e + 1, '\\'); | ||
| 211 | if (tkn_e || (strlen(fullpath) - ref->path_consumed)) { | ||
| 212 | strncat(mountdata, &sep, 1); | ||
| 213 | strcat(mountdata, "prefixpath="); | ||
| 214 | if (tkn_e) | ||
| 215 | strcat(mountdata, tkn_e + 1); | ||
| 216 | strcat(mountdata, fullpath + ref->path_consumed); | ||
| 217 | } | ||
| 218 | 221 | ||
| 219 | /*cifs_dbg(FYI, "%s: parent mountdata: %s\n", __func__, sb_mountdata);*/ | 222 | /*cifs_dbg(FYI, "%s: parent mountdata: %s\n", __func__, sb_mountdata);*/ |
| 220 | /*cifs_dbg(FYI, "%s: submount mountdata: %s\n", __func__, mountdata );*/ | 223 | /*cifs_dbg(FYI, "%s: submount mountdata: %s\n", __func__, mountdata );*/ |
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 72e4efee1389..3752b9f6d9e4 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
| @@ -372,9 +372,6 @@ cifs_show_options(struct seq_file *s, struct dentry *root) | |||
| 372 | cifs_show_security(s, tcon->ses->server); | 372 | cifs_show_security(s, tcon->ses->server); |
| 373 | cifs_show_cache_flavor(s, cifs_sb); | 373 | cifs_show_cache_flavor(s, cifs_sb); |
| 374 | 374 | ||
| 375 | seq_printf(s, ",unc="); | ||
| 376 | seq_escape(s, tcon->treeName, " \t\n\\"); | ||
| 377 | |||
| 378 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MULTIUSER) | 375 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MULTIUSER) |
| 379 | seq_printf(s, ",multiuser"); | 376 | seq_printf(s, ",multiuser"); |
| 380 | else if (tcon->ses->user_name) | 377 | else if (tcon->ses->user_name) |
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 99eeaa17ee00..5b97e56ddbca 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
| @@ -1061,6 +1061,7 @@ static int cifs_parse_security_flavors(char *value, | |||
| 1061 | #endif | 1061 | #endif |
| 1062 | case Opt_sec_none: | 1062 | case Opt_sec_none: |
| 1063 | vol->nullauth = 1; | 1063 | vol->nullauth = 1; |
| 1064 | vol->secFlg |= CIFSSEC_MAY_NTLM; | ||
| 1064 | break; | 1065 | break; |
| 1065 | default: | 1066 | default: |
| 1066 | cifs_dbg(VFS, "bad security option: %s\n", value); | 1067 | cifs_dbg(VFS, "bad security option: %s\n", value); |
| @@ -1257,14 +1258,18 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, | |||
| 1257 | vol->backupuid_specified = false; /* no backup intent for a user */ | 1258 | vol->backupuid_specified = false; /* no backup intent for a user */ |
| 1258 | vol->backupgid_specified = false; /* no backup intent for a group */ | 1259 | vol->backupgid_specified = false; /* no backup intent for a group */ |
| 1259 | 1260 | ||
| 1260 | /* | 1261 | switch (cifs_parse_devname(devname, vol)) { |
| 1261 | * For now, we ignore -EINVAL errors under the assumption that the | 1262 | case 0: |
| 1262 | * unc= and prefixpath= options will be usable. | 1263 | break; |
| 1263 | */ | 1264 | case -ENOMEM: |
| 1264 | if (cifs_parse_devname(devname, vol) == -ENOMEM) { | 1265 | cifs_dbg(VFS, "Unable to allocate memory for devname.\n"); |
| 1265 | printk(KERN_ERR "CIFS: Unable to allocate memory to parse " | 1266 | goto cifs_parse_mount_err; |
| 1266 | "device string.\n"); | 1267 | case -EINVAL: |
| 1267 | goto out_nomem; | 1268 | cifs_dbg(VFS, "Malformed UNC in devname.\n"); |
| 1269 | goto cifs_parse_mount_err; | ||
| 1270 | default: | ||
| 1271 | cifs_dbg(VFS, "Unknown error parsing devname.\n"); | ||
| 1272 | goto cifs_parse_mount_err; | ||
| 1268 | } | 1273 | } |
| 1269 | 1274 | ||
| 1270 | while ((data = strsep(&options, separator)) != NULL) { | 1275 | while ((data = strsep(&options, separator)) != NULL) { |
| @@ -1826,7 +1831,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, | |||
| 1826 | } | 1831 | } |
| 1827 | #endif | 1832 | #endif |
| 1828 | if (!vol->UNC) { | 1833 | if (!vol->UNC) { |
| 1829 | cifs_dbg(VFS, "CIFS mount error: No usable UNC path provided in device string or in unc= option!\n"); | 1834 | cifs_dbg(VFS, "CIFS mount error: No usable UNC path provided in device string!\n"); |
| 1830 | goto cifs_parse_mount_err; | 1835 | goto cifs_parse_mount_err; |
| 1831 | } | 1836 | } |
| 1832 | 1837 | ||
diff --git a/fs/cifs/dns_resolve.c b/fs/cifs/dns_resolve.c index e7512e497611..7ede7306599f 100644 --- a/fs/cifs/dns_resolve.c +++ b/fs/cifs/dns_resolve.c | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | 34 | ||
| 35 | /** | 35 | /** |
| 36 | * dns_resolve_server_name_to_ip - Resolve UNC server name to ip address. | 36 | * dns_resolve_server_name_to_ip - Resolve UNC server name to ip address. |
| 37 | * @unc: UNC path specifying the server | 37 | * @unc: UNC path specifying the server (with '/' as delimiter) |
| 38 | * @ip_addr: Where to return the IP address. | 38 | * @ip_addr: Where to return the IP address. |
| 39 | * | 39 | * |
| 40 | * The IP address will be returned in string form, and the caller is | 40 | * The IP address will be returned in string form, and the caller is |
| @@ -64,7 +64,7 @@ dns_resolve_server_name_to_ip(const char *unc, char **ip_addr) | |||
| 64 | hostname = unc + 2; | 64 | hostname = unc + 2; |
| 65 | 65 | ||
| 66 | /* Search for server name delimiter */ | 66 | /* Search for server name delimiter */ |
| 67 | sep = memchr(hostname, '\\', len); | 67 | sep = memchr(hostname, '/', len); |
| 68 | if (sep) | 68 | if (sep) |
| 69 | len = sep - hostname; | 69 | len = sep - hostname; |
| 70 | else | 70 | else |
diff --git a/fs/efivarfs/file.c b/fs/efivarfs/file.c index bfb531564319..8dd524f32284 100644 --- a/fs/efivarfs/file.c +++ b/fs/efivarfs/file.c | |||
| @@ -44,8 +44,11 @@ static ssize_t efivarfs_file_write(struct file *file, | |||
| 44 | 44 | ||
| 45 | bytes = efivar_entry_set_get_size(var, attributes, &datasize, | 45 | bytes = efivar_entry_set_get_size(var, attributes, &datasize, |
| 46 | data, &set); | 46 | data, &set); |
| 47 | if (!set && bytes) | 47 | if (!set && bytes) { |
| 48 | if (bytes == -ENOENT) | ||
| 49 | bytes = -EIO; | ||
| 48 | goto out; | 50 | goto out; |
| 51 | } | ||
| 49 | 52 | ||
| 50 | if (bytes == -ENOENT) { | 53 | if (bytes == -ENOENT) { |
| 51 | drop_nlink(inode); | 54 | drop_nlink(inode); |
| @@ -76,7 +79,14 @@ static ssize_t efivarfs_file_read(struct file *file, char __user *userbuf, | |||
| 76 | int err; | 79 | int err; |
| 77 | 80 | ||
| 78 | err = efivar_entry_size(var, &datasize); | 81 | err = efivar_entry_size(var, &datasize); |
| 79 | if (err) | 82 | |
| 83 | /* | ||
| 84 | * efivarfs represents uncommitted variables with | ||
| 85 | * zero-length files. Reading them should return EOF. | ||
| 86 | */ | ||
| 87 | if (err == -ENOENT) | ||
| 88 | return 0; | ||
| 89 | else if (err) | ||
| 80 | return err; | 90 | return err; |
| 81 | 91 | ||
| 82 | data = kmalloc(datasize + sizeof(attributes), GFP_KERNEL); | 92 | data = kmalloc(datasize + sizeof(attributes), GFP_KERNEL); |
diff --git a/fs/hpfs/dir.c b/fs/hpfs/dir.c index 546f6d39713a..834ac13c04b7 100644 --- a/fs/hpfs/dir.c +++ b/fs/hpfs/dir.c | |||
| @@ -33,25 +33,27 @@ static loff_t hpfs_dir_lseek(struct file *filp, loff_t off, int whence) | |||
| 33 | if (whence == SEEK_DATA || whence == SEEK_HOLE) | 33 | if (whence == SEEK_DATA || whence == SEEK_HOLE) |
| 34 | return -EINVAL; | 34 | return -EINVAL; |
| 35 | 35 | ||
| 36 | mutex_lock(&i->i_mutex); | ||
| 36 | hpfs_lock(s); | 37 | hpfs_lock(s); |
| 37 | 38 | ||
| 38 | /*printk("dir lseek\n");*/ | 39 | /*printk("dir lseek\n");*/ |
| 39 | if (new_off == 0 || new_off == 1 || new_off == 11 || new_off == 12 || new_off == 13) goto ok; | 40 | if (new_off == 0 || new_off == 1 || new_off == 11 || new_off == 12 || new_off == 13) goto ok; |
| 40 | mutex_lock(&i->i_mutex); | ||
| 41 | pos = ((loff_t) hpfs_de_as_down_as_possible(s, hpfs_inode->i_dno) << 4) + 1; | 41 | pos = ((loff_t) hpfs_de_as_down_as_possible(s, hpfs_inode->i_dno) << 4) + 1; |
| 42 | while (pos != new_off) { | 42 | while (pos != new_off) { |
| 43 | if (map_pos_dirent(i, &pos, &qbh)) hpfs_brelse4(&qbh); | 43 | if (map_pos_dirent(i, &pos, &qbh)) hpfs_brelse4(&qbh); |
| 44 | else goto fail; | 44 | else goto fail; |
| 45 | if (pos == 12) goto fail; | 45 | if (pos == 12) goto fail; |
| 46 | } | 46 | } |
| 47 | mutex_unlock(&i->i_mutex); | 47 | hpfs_add_pos(i, &filp->f_pos); |
| 48 | ok: | 48 | ok: |
| 49 | filp->f_pos = new_off; | ||
| 49 | hpfs_unlock(s); | 50 | hpfs_unlock(s); |
| 50 | return filp->f_pos = new_off; | ||
| 51 | fail: | ||
| 52 | mutex_unlock(&i->i_mutex); | 51 | mutex_unlock(&i->i_mutex); |
| 52 | return new_off; | ||
| 53 | fail: | ||
| 53 | /*printk("illegal lseek: %016llx\n", new_off);*/ | 54 | /*printk("illegal lseek: %016llx\n", new_off);*/ |
| 54 | hpfs_unlock(s); | 55 | hpfs_unlock(s); |
| 56 | mutex_unlock(&i->i_mutex); | ||
| 55 | return -ESPIPE; | 57 | return -ESPIPE; |
| 56 | } | 58 | } |
| 57 | 59 | ||
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 4e2fe714d5c2..d7ba5616989c 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
| @@ -1078,7 +1078,7 @@ static struct nfs4_state *nfs4_try_open_cached(struct nfs4_opendata *opendata) | |||
| 1078 | struct nfs4_state *state = opendata->state; | 1078 | struct nfs4_state *state = opendata->state; |
| 1079 | struct nfs_inode *nfsi = NFS_I(state->inode); | 1079 | struct nfs_inode *nfsi = NFS_I(state->inode); |
| 1080 | struct nfs_delegation *delegation; | 1080 | struct nfs_delegation *delegation; |
| 1081 | int open_mode = opendata->o_arg.open_flags & (O_EXCL|O_TRUNC); | 1081 | int open_mode = opendata->o_arg.open_flags; |
| 1082 | fmode_t fmode = opendata->o_arg.fmode; | 1082 | fmode_t fmode = opendata->o_arg.fmode; |
| 1083 | nfs4_stateid stateid; | 1083 | nfs4_stateid stateid; |
| 1084 | int ret = -EAGAIN; | 1084 | int ret = -EAGAIN; |
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index a366107a7331..2d7525fbcf25 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
| @@ -1942,6 +1942,7 @@ static int nfs23_validate_mount_data(void *options, | |||
| 1942 | args->namlen = data->namlen; | 1942 | args->namlen = data->namlen; |
| 1943 | args->bsize = data->bsize; | 1943 | args->bsize = data->bsize; |
| 1944 | 1944 | ||
| 1945 | args->auth_flavors[0] = RPC_AUTH_UNIX; | ||
| 1945 | if (data->flags & NFS_MOUNT_SECFLAVOUR) | 1946 | if (data->flags & NFS_MOUNT_SECFLAVOUR) |
| 1946 | args->auth_flavors[0] = data->pseudoflavor; | 1947 | args->auth_flavors[0] = data->pseudoflavor; |
| 1947 | if (!args->nfs_server.hostname) | 1948 | if (!args->nfs_server.hostname) |
| @@ -2637,6 +2638,7 @@ static int nfs4_validate_mount_data(void *options, | |||
| 2637 | goto out_no_address; | 2638 | goto out_no_address; |
| 2638 | args->nfs_server.port = ntohs(((struct sockaddr_in *)sap)->sin_port); | 2639 | args->nfs_server.port = ntohs(((struct sockaddr_in *)sap)->sin_port); |
| 2639 | 2640 | ||
| 2641 | args->auth_flavors[0] = RPC_AUTH_UNIX; | ||
| 2640 | if (data->auth_flavourlen) { | 2642 | if (data->auth_flavourlen) { |
| 2641 | if (data->auth_flavourlen > 1) | 2643 | if (data->auth_flavourlen > 1) |
| 2642 | goto out_inval_auth; | 2644 | goto out_inval_auth; |
diff --git a/fs/pnode.c b/fs/pnode.c index 3d2a7141b87a..9af0df15256e 100644 --- a/fs/pnode.c +++ b/fs/pnode.c | |||
| @@ -83,7 +83,8 @@ static int do_make_slave(struct mount *mnt) | |||
| 83 | if (peer_mnt == mnt) | 83 | if (peer_mnt == mnt) |
| 84 | peer_mnt = NULL; | 84 | peer_mnt = NULL; |
| 85 | } | 85 | } |
| 86 | if (IS_MNT_SHARED(mnt) && list_empty(&mnt->mnt_share)) | 86 | if (mnt->mnt_group_id && IS_MNT_SHARED(mnt) && |
| 87 | list_empty(&mnt->mnt_share)) | ||
| 87 | mnt_release_group_id(mnt); | 88 | mnt_release_group_id(mnt); |
| 88 | 89 | ||
| 89 | list_del_init(&mnt->mnt_share); | 90 | list_del_init(&mnt->mnt_share); |
diff --git a/fs/qnx6/dir.c b/fs/qnx6/dir.c index 8798d065e400..afa6be6fc397 100644 --- a/fs/qnx6/dir.c +++ b/fs/qnx6/dir.c | |||
| @@ -120,7 +120,7 @@ static int qnx6_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
| 120 | struct inode *inode = file_inode(filp); | 120 | struct inode *inode = file_inode(filp); |
| 121 | struct super_block *s = inode->i_sb; | 121 | struct super_block *s = inode->i_sb; |
| 122 | struct qnx6_sb_info *sbi = QNX6_SB(s); | 122 | struct qnx6_sb_info *sbi = QNX6_SB(s); |
| 123 | loff_t pos = filp->f_pos & (QNX6_DIR_ENTRY_SIZE - 1); | 123 | loff_t pos = filp->f_pos & ~(QNX6_DIR_ENTRY_SIZE - 1); |
| 124 | unsigned long npages = dir_pages(inode); | 124 | unsigned long npages = dir_pages(inode); |
| 125 | unsigned long n = pos >> PAGE_CACHE_SHIFT; | 125 | unsigned long n = pos >> PAGE_CACHE_SHIFT; |
| 126 | unsigned start = (pos & ~PAGE_CACHE_MASK) / QNX6_DIR_ENTRY_SIZE; | 126 | unsigned start = (pos & ~PAGE_CACHE_MASK) / QNX6_DIR_ENTRY_SIZE; |
diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c index 66c53b642a88..6c2d136561cb 100644 --- a/fs/reiserfs/dir.c +++ b/fs/reiserfs/dir.c | |||
| @@ -204,6 +204,8 @@ int reiserfs_readdir_dentry(struct dentry *dentry, void *dirent, | |||
| 204 | next_pos = deh_offset(deh) + 1; | 204 | next_pos = deh_offset(deh) + 1; |
| 205 | 205 | ||
| 206 | if (item_moved(&tmp_ih, &path_to_entry)) { | 206 | if (item_moved(&tmp_ih, &path_to_entry)) { |
| 207 | set_cpu_key_k_offset(&pos_key, | ||
| 208 | next_pos); | ||
| 207 | goto research; | 209 | goto research; |
| 208 | } | 210 | } |
| 209 | } /* for */ | 211 | } /* for */ |
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index 77d6d47abc83..f844533792ee 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c | |||
| @@ -1811,11 +1811,16 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th, | |||
| 1811 | TYPE_STAT_DATA, SD_SIZE, MAX_US_INT); | 1811 | TYPE_STAT_DATA, SD_SIZE, MAX_US_INT); |
| 1812 | memcpy(INODE_PKEY(inode), &(ih.ih_key), KEY_SIZE); | 1812 | memcpy(INODE_PKEY(inode), &(ih.ih_key), KEY_SIZE); |
| 1813 | args.dirid = le32_to_cpu(ih.ih_key.k_dir_id); | 1813 | args.dirid = le32_to_cpu(ih.ih_key.k_dir_id); |
| 1814 | if (insert_inode_locked4(inode, args.objectid, | 1814 | |
| 1815 | reiserfs_find_actor, &args) < 0) { | 1815 | reiserfs_write_unlock(inode->i_sb); |
| 1816 | err = insert_inode_locked4(inode, args.objectid, | ||
| 1817 | reiserfs_find_actor, &args); | ||
| 1818 | reiserfs_write_lock(inode->i_sb); | ||
| 1819 | if (err) { | ||
| 1816 | err = -EINVAL; | 1820 | err = -EINVAL; |
| 1817 | goto out_bad_inode; | 1821 | goto out_bad_inode; |
| 1818 | } | 1822 | } |
| 1823 | |||
| 1819 | if (old_format_only(sb)) | 1824 | if (old_format_only(sb)) |
| 1820 | /* not a perfect generation count, as object ids can be reused, but | 1825 | /* not a perfect generation count, as object ids can be reused, but |
| 1821 | ** this is as good as reiserfs can do right now. | 1826 | ** this is as good as reiserfs can do right now. |
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index 4cce1d9552fb..821bcf70e467 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c | |||
| @@ -318,7 +318,19 @@ static int delete_one_xattr(struct dentry *dentry, void *data) | |||
| 318 | static int chown_one_xattr(struct dentry *dentry, void *data) | 318 | static int chown_one_xattr(struct dentry *dentry, void *data) |
| 319 | { | 319 | { |
| 320 | struct iattr *attrs = data; | 320 | struct iattr *attrs = data; |
| 321 | return reiserfs_setattr(dentry, attrs); | 321 | int ia_valid = attrs->ia_valid; |
| 322 | int err; | ||
| 323 | |||
| 324 | /* | ||
| 325 | * We only want the ownership bits. Otherwise, we'll do | ||
| 326 | * things like change a directory to a regular file if | ||
| 327 | * ATTR_MODE is set. | ||
| 328 | */ | ||
| 329 | attrs->ia_valid &= (ATTR_UID|ATTR_GID); | ||
| 330 | err = reiserfs_setattr(dentry, attrs); | ||
| 331 | attrs->ia_valid = ia_valid; | ||
| 332 | |||
| 333 | return err; | ||
| 322 | } | 334 | } |
| 323 | 335 | ||
| 324 | /* No i_mutex, but the inode is unconnected. */ | 336 | /* No i_mutex, but the inode is unconnected. */ |
diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c index d7c01ef64eda..6c8767fdfc6a 100644 --- a/fs/reiserfs/xattr_acl.c +++ b/fs/reiserfs/xattr_acl.c | |||
| @@ -443,6 +443,9 @@ int reiserfs_acl_chmod(struct inode *inode) | |||
| 443 | int depth; | 443 | int depth; |
| 444 | int error; | 444 | int error; |
| 445 | 445 | ||
| 446 | if (IS_PRIVATE(inode)) | ||
| 447 | return 0; | ||
| 448 | |||
| 446 | if (S_ISLNK(inode->i_mode)) | 449 | if (S_ISLNK(inode->i_mode)) |
| 447 | return -EOPNOTSUPP; | 450 | return -EOPNOTSUPP; |
| 448 | 451 | ||
diff --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c index 0bce1b348580..d788302e506a 100644 --- a/fs/xfs/xfs_attr_leaf.c +++ b/fs/xfs/xfs_attr_leaf.c | |||
| @@ -1412,7 +1412,7 @@ xfs_attr3_leaf_add_work( | |||
| 1412 | name_rmt->valuelen = 0; | 1412 | name_rmt->valuelen = 0; |
| 1413 | name_rmt->valueblk = 0; | 1413 | name_rmt->valueblk = 0; |
| 1414 | args->rmtblkno = 1; | 1414 | args->rmtblkno = 1; |
| 1415 | args->rmtblkcnt = XFS_B_TO_FSB(mp, args->valuelen); | 1415 | args->rmtblkcnt = xfs_attr3_rmt_blocks(mp, args->valuelen); |
| 1416 | } | 1416 | } |
| 1417 | xfs_trans_log_buf(args->trans, bp, | 1417 | xfs_trans_log_buf(args->trans, bp, |
| 1418 | XFS_DA_LOGRANGE(leaf, xfs_attr3_leaf_name(leaf, args->index), | 1418 | XFS_DA_LOGRANGE(leaf, xfs_attr3_leaf_name(leaf, args->index), |
| @@ -1445,11 +1445,12 @@ xfs_attr3_leaf_add_work( | |||
| 1445 | STATIC void | 1445 | STATIC void |
| 1446 | xfs_attr3_leaf_compact( | 1446 | xfs_attr3_leaf_compact( |
| 1447 | struct xfs_da_args *args, | 1447 | struct xfs_da_args *args, |
| 1448 | struct xfs_attr3_icleaf_hdr *ichdr_d, | 1448 | struct xfs_attr3_icleaf_hdr *ichdr_dst, |
| 1449 | struct xfs_buf *bp) | 1449 | struct xfs_buf *bp) |
| 1450 | { | 1450 | { |
| 1451 | xfs_attr_leafblock_t *leaf_s, *leaf_d; | 1451 | struct xfs_attr_leafblock *leaf_src; |
| 1452 | struct xfs_attr3_icleaf_hdr ichdr_s; | 1452 | struct xfs_attr_leafblock *leaf_dst; |
| 1453 | struct xfs_attr3_icleaf_hdr ichdr_src; | ||
| 1453 | struct xfs_trans *trans = args->trans; | 1454 | struct xfs_trans *trans = args->trans; |
| 1454 | struct xfs_mount *mp = trans->t_mountp; | 1455 | struct xfs_mount *mp = trans->t_mountp; |
| 1455 | char *tmpbuffer; | 1456 | char *tmpbuffer; |
| @@ -1457,29 +1458,38 @@ xfs_attr3_leaf_compact( | |||
| 1457 | trace_xfs_attr_leaf_compact(args); | 1458 | trace_xfs_attr_leaf_compact(args); |
| 1458 | 1459 | ||
| 1459 | tmpbuffer = kmem_alloc(XFS_LBSIZE(mp), KM_SLEEP); | 1460 | tmpbuffer = kmem_alloc(XFS_LBSIZE(mp), KM_SLEEP); |
| 1460 | ASSERT(tmpbuffer != NULL); | ||
| 1461 | memcpy(tmpbuffer, bp->b_addr, XFS_LBSIZE(mp)); | 1461 | memcpy(tmpbuffer, bp->b_addr, XFS_LBSIZE(mp)); |
| 1462 | memset(bp->b_addr, 0, XFS_LBSIZE(mp)); | 1462 | memset(bp->b_addr, 0, XFS_LBSIZE(mp)); |
| 1463 | leaf_src = (xfs_attr_leafblock_t *)tmpbuffer; | ||
| 1464 | leaf_dst = bp->b_addr; | ||
| 1463 | 1465 | ||
| 1464 | /* | 1466 | /* |
| 1465 | * Copy basic information | 1467 | * Copy the on-disk header back into the destination buffer to ensure |
| 1468 | * all the information in the header that is not part of the incore | ||
| 1469 | * header structure is preserved. | ||
| 1466 | */ | 1470 | */ |
| 1467 | leaf_s = (xfs_attr_leafblock_t *)tmpbuffer; | 1471 | memcpy(bp->b_addr, tmpbuffer, xfs_attr3_leaf_hdr_size(leaf_src)); |
| 1468 | leaf_d = bp->b_addr; | 1472 | |
| 1469 | ichdr_s = *ichdr_d; /* struct copy */ | 1473 | /* Initialise the incore headers */ |
| 1470 | ichdr_d->firstused = XFS_LBSIZE(mp); | 1474 | ichdr_src = *ichdr_dst; /* struct copy */ |
| 1471 | ichdr_d->usedbytes = 0; | 1475 | ichdr_dst->firstused = XFS_LBSIZE(mp); |
| 1472 | ichdr_d->count = 0; | 1476 | ichdr_dst->usedbytes = 0; |
| 1473 | ichdr_d->holes = 0; | 1477 | ichdr_dst->count = 0; |
| 1474 | ichdr_d->freemap[0].base = xfs_attr3_leaf_hdr_size(leaf_s); | 1478 | ichdr_dst->holes = 0; |
| 1475 | ichdr_d->freemap[0].size = ichdr_d->firstused - ichdr_d->freemap[0].base; | 1479 | ichdr_dst->freemap[0].base = xfs_attr3_leaf_hdr_size(leaf_src); |
| 1480 | ichdr_dst->freemap[0].size = ichdr_dst->firstused - | ||
| 1481 | ichdr_dst->freemap[0].base; | ||
| 1482 | |||
| 1483 | |||
| 1484 | /* write the header back to initialise the underlying buffer */ | ||
| 1485 | xfs_attr3_leaf_hdr_to_disk(leaf_dst, ichdr_dst); | ||
| 1476 | 1486 | ||
| 1477 | /* | 1487 | /* |
| 1478 | * Copy all entry's in the same (sorted) order, | 1488 | * Copy all entry's in the same (sorted) order, |
| 1479 | * but allocate name/value pairs packed and in sequence. | 1489 | * but allocate name/value pairs packed and in sequence. |
| 1480 | */ | 1490 | */ |
| 1481 | xfs_attr3_leaf_moveents(leaf_s, &ichdr_s, 0, leaf_d, ichdr_d, 0, | 1491 | xfs_attr3_leaf_moveents(leaf_src, &ichdr_src, 0, leaf_dst, ichdr_dst, 0, |
| 1482 | ichdr_s.count, mp); | 1492 | ichdr_src.count, mp); |
| 1483 | /* | 1493 | /* |
| 1484 | * this logs the entire buffer, but the caller must write the header | 1494 | * this logs the entire buffer, but the caller must write the header |
| 1485 | * back to the buffer when it is finished modifying it. | 1495 | * back to the buffer when it is finished modifying it. |
| @@ -2181,14 +2191,24 @@ xfs_attr3_leaf_unbalance( | |||
| 2181 | struct xfs_attr_leafblock *tmp_leaf; | 2191 | struct xfs_attr_leafblock *tmp_leaf; |
| 2182 | struct xfs_attr3_icleaf_hdr tmphdr; | 2192 | struct xfs_attr3_icleaf_hdr tmphdr; |
| 2183 | 2193 | ||
| 2184 | tmp_leaf = kmem_alloc(state->blocksize, KM_SLEEP); | 2194 | tmp_leaf = kmem_zalloc(state->blocksize, KM_SLEEP); |
| 2185 | memset(tmp_leaf, 0, state->blocksize); | ||
| 2186 | memset(&tmphdr, 0, sizeof(tmphdr)); | ||
| 2187 | 2195 | ||
| 2196 | /* | ||
| 2197 | * Copy the header into the temp leaf so that all the stuff | ||
| 2198 | * not in the incore header is present and gets copied back in | ||
| 2199 | * once we've moved all the entries. | ||
| 2200 | */ | ||
| 2201 | memcpy(tmp_leaf, save_leaf, xfs_attr3_leaf_hdr_size(save_leaf)); | ||
| 2202 | |||
| 2203 | memset(&tmphdr, 0, sizeof(tmphdr)); | ||
| 2188 | tmphdr.magic = savehdr.magic; | 2204 | tmphdr.magic = savehdr.magic; |
| 2189 | tmphdr.forw = savehdr.forw; | 2205 | tmphdr.forw = savehdr.forw; |
| 2190 | tmphdr.back = savehdr.back; | 2206 | tmphdr.back = savehdr.back; |
| 2191 | tmphdr.firstused = state->blocksize; | 2207 | tmphdr.firstused = state->blocksize; |
| 2208 | |||
| 2209 | /* write the header to the temp buffer to initialise it */ | ||
| 2210 | xfs_attr3_leaf_hdr_to_disk(tmp_leaf, &tmphdr); | ||
| 2211 | |||
| 2192 | if (xfs_attr3_leaf_order(save_blk->bp, &savehdr, | 2212 | if (xfs_attr3_leaf_order(save_blk->bp, &savehdr, |
| 2193 | drop_blk->bp, &drophdr)) { | 2213 | drop_blk->bp, &drophdr)) { |
| 2194 | xfs_attr3_leaf_moveents(drop_leaf, &drophdr, 0, | 2214 | xfs_attr3_leaf_moveents(drop_leaf, &drophdr, 0, |
| @@ -2334,8 +2354,9 @@ xfs_attr3_leaf_lookup_int( | |||
| 2334 | args->index = probe; | 2354 | args->index = probe; |
| 2335 | args->valuelen = be32_to_cpu(name_rmt->valuelen); | 2355 | args->valuelen = be32_to_cpu(name_rmt->valuelen); |
| 2336 | args->rmtblkno = be32_to_cpu(name_rmt->valueblk); | 2356 | args->rmtblkno = be32_to_cpu(name_rmt->valueblk); |
| 2337 | args->rmtblkcnt = XFS_B_TO_FSB(args->dp->i_mount, | 2357 | args->rmtblkcnt = xfs_attr3_rmt_blocks( |
| 2338 | args->valuelen); | 2358 | args->dp->i_mount, |
| 2359 | args->valuelen); | ||
| 2339 | return XFS_ERROR(EEXIST); | 2360 | return XFS_ERROR(EEXIST); |
| 2340 | } | 2361 | } |
| 2341 | } | 2362 | } |
| @@ -2386,7 +2407,8 @@ xfs_attr3_leaf_getvalue( | |||
| 2386 | ASSERT(memcmp(args->name, name_rmt->name, args->namelen) == 0); | 2407 | ASSERT(memcmp(args->name, name_rmt->name, args->namelen) == 0); |
| 2387 | valuelen = be32_to_cpu(name_rmt->valuelen); | 2408 | valuelen = be32_to_cpu(name_rmt->valuelen); |
| 2388 | args->rmtblkno = be32_to_cpu(name_rmt->valueblk); | 2409 | args->rmtblkno = be32_to_cpu(name_rmt->valueblk); |
| 2389 | args->rmtblkcnt = XFS_B_TO_FSB(args->dp->i_mount, valuelen); | 2410 | args->rmtblkcnt = xfs_attr3_rmt_blocks(args->dp->i_mount, |
| 2411 | valuelen); | ||
| 2390 | if (args->flags & ATTR_KERNOVAL) { | 2412 | if (args->flags & ATTR_KERNOVAL) { |
| 2391 | args->valuelen = valuelen; | 2413 | args->valuelen = valuelen; |
| 2392 | return 0; | 2414 | return 0; |
| @@ -2712,7 +2734,8 @@ xfs_attr3_leaf_list_int( | |||
| 2712 | args.valuelen = valuelen; | 2734 | args.valuelen = valuelen; |
| 2713 | args.value = kmem_alloc(valuelen, KM_SLEEP | KM_NOFS); | 2735 | args.value = kmem_alloc(valuelen, KM_SLEEP | KM_NOFS); |
| 2714 | args.rmtblkno = be32_to_cpu(name_rmt->valueblk); | 2736 | args.rmtblkno = be32_to_cpu(name_rmt->valueblk); |
| 2715 | args.rmtblkcnt = XFS_B_TO_FSB(args.dp->i_mount, valuelen); | 2737 | args.rmtblkcnt = xfs_attr3_rmt_blocks( |
| 2738 | args.dp->i_mount, valuelen); | ||
| 2716 | retval = xfs_attr_rmtval_get(&args); | 2739 | retval = xfs_attr_rmtval_get(&args); |
| 2717 | if (retval) | 2740 | if (retval) |
| 2718 | return retval; | 2741 | return retval; |
diff --git a/fs/xfs/xfs_attr_remote.c b/fs/xfs/xfs_attr_remote.c index dee84466dcc9..ef6b0c124528 100644 --- a/fs/xfs/xfs_attr_remote.c +++ b/fs/xfs/xfs_attr_remote.c | |||
| @@ -47,22 +47,55 @@ | |||
| 47 | * Each contiguous block has a header, so it is not just a simple attribute | 47 | * Each contiguous block has a header, so it is not just a simple attribute |
| 48 | * length to FSB conversion. | 48 | * length to FSB conversion. |
| 49 | */ | 49 | */ |
| 50 | static int | 50 | int |
| 51 | xfs_attr3_rmt_blocks( | 51 | xfs_attr3_rmt_blocks( |
| 52 | struct xfs_mount *mp, | 52 | struct xfs_mount *mp, |
| 53 | int attrlen) | 53 | int attrlen) |
| 54 | { | 54 | { |
| 55 | int buflen = XFS_ATTR3_RMT_BUF_SPACE(mp, | 55 | if (xfs_sb_version_hascrc(&mp->m_sb)) { |
| 56 | mp->m_sb.sb_blocksize); | 56 | int buflen = XFS_ATTR3_RMT_BUF_SPACE(mp, mp->m_sb.sb_blocksize); |
| 57 | return (attrlen + buflen - 1) / buflen; | 57 | return (attrlen + buflen - 1) / buflen; |
| 58 | } | ||
| 59 | return XFS_B_TO_FSB(mp, attrlen); | ||
| 60 | } | ||
| 61 | |||
| 62 | /* | ||
| 63 | * Checking of the remote attribute header is split into two parts. The verifier | ||
| 64 | * does CRC, location and bounds checking, the unpacking function checks the | ||
| 65 | * attribute parameters and owner. | ||
| 66 | */ | ||
| 67 | static bool | ||
| 68 | xfs_attr3_rmt_hdr_ok( | ||
| 69 | struct xfs_mount *mp, | ||
| 70 | void *ptr, | ||
| 71 | xfs_ino_t ino, | ||
| 72 | uint32_t offset, | ||
| 73 | uint32_t size, | ||
| 74 | xfs_daddr_t bno) | ||
| 75 | { | ||
| 76 | struct xfs_attr3_rmt_hdr *rmt = ptr; | ||
| 77 | |||
| 78 | if (bno != be64_to_cpu(rmt->rm_blkno)) | ||
| 79 | return false; | ||
| 80 | if (offset != be32_to_cpu(rmt->rm_offset)) | ||
| 81 | return false; | ||
| 82 | if (size != be32_to_cpu(rmt->rm_bytes)) | ||
| 83 | return false; | ||
| 84 | if (ino != be64_to_cpu(rmt->rm_owner)) | ||
| 85 | return false; | ||
| 86 | |||
| 87 | /* ok */ | ||
| 88 | return true; | ||
| 58 | } | 89 | } |
| 59 | 90 | ||
| 60 | static bool | 91 | static bool |
| 61 | xfs_attr3_rmt_verify( | 92 | xfs_attr3_rmt_verify( |
| 62 | struct xfs_buf *bp) | 93 | struct xfs_mount *mp, |
| 94 | void *ptr, | ||
| 95 | int fsbsize, | ||
| 96 | xfs_daddr_t bno) | ||
| 63 | { | 97 | { |
| 64 | struct xfs_mount *mp = bp->b_target->bt_mount; | 98 | struct xfs_attr3_rmt_hdr *rmt = ptr; |
| 65 | struct xfs_attr3_rmt_hdr *rmt = bp->b_addr; | ||
| 66 | 99 | ||
| 67 | if (!xfs_sb_version_hascrc(&mp->m_sb)) | 100 | if (!xfs_sb_version_hascrc(&mp->m_sb)) |
| 68 | return false; | 101 | return false; |
| @@ -70,7 +103,9 @@ xfs_attr3_rmt_verify( | |||
| 70 | return false; | 103 | return false; |
| 71 | if (!uuid_equal(&rmt->rm_uuid, &mp->m_sb.sb_uuid)) | 104 | if (!uuid_equal(&rmt->rm_uuid, &mp->m_sb.sb_uuid)) |
| 72 | return false; | 105 | return false; |
| 73 | if (bp->b_bn != be64_to_cpu(rmt->rm_blkno)) | 106 | if (be64_to_cpu(rmt->rm_blkno) != bno) |
| 107 | return false; | ||
| 108 | if (be32_to_cpu(rmt->rm_bytes) > fsbsize - sizeof(*rmt)) | ||
| 74 | return false; | 109 | return false; |
| 75 | if (be32_to_cpu(rmt->rm_offset) + | 110 | if (be32_to_cpu(rmt->rm_offset) + |
| 76 | be32_to_cpu(rmt->rm_bytes) >= XATTR_SIZE_MAX) | 111 | be32_to_cpu(rmt->rm_bytes) >= XATTR_SIZE_MAX) |
| @@ -86,17 +121,40 @@ xfs_attr3_rmt_read_verify( | |||
| 86 | struct xfs_buf *bp) | 121 | struct xfs_buf *bp) |
| 87 | { | 122 | { |
| 88 | struct xfs_mount *mp = bp->b_target->bt_mount; | 123 | struct xfs_mount *mp = bp->b_target->bt_mount; |
| 124 | char *ptr; | ||
| 125 | int len; | ||
| 126 | bool corrupt = false; | ||
| 127 | xfs_daddr_t bno; | ||
| 89 | 128 | ||
| 90 | /* no verification of non-crc buffers */ | 129 | /* no verification of non-crc buffers */ |
| 91 | if (!xfs_sb_version_hascrc(&mp->m_sb)) | 130 | if (!xfs_sb_version_hascrc(&mp->m_sb)) |
| 92 | return; | 131 | return; |
| 93 | 132 | ||
| 94 | if (!xfs_verify_cksum(bp->b_addr, BBTOB(bp->b_length), | 133 | ptr = bp->b_addr; |
| 95 | XFS_ATTR3_RMT_CRC_OFF) || | 134 | bno = bp->b_bn; |
| 96 | !xfs_attr3_rmt_verify(bp)) { | 135 | len = BBTOB(bp->b_length); |
| 136 | ASSERT(len >= XFS_LBSIZE(mp)); | ||
| 137 | |||
| 138 | while (len > 0) { | ||
| 139 | if (!xfs_verify_cksum(ptr, XFS_LBSIZE(mp), | ||
| 140 | XFS_ATTR3_RMT_CRC_OFF)) { | ||
| 141 | corrupt = true; | ||
| 142 | break; | ||
| 143 | } | ||
| 144 | if (!xfs_attr3_rmt_verify(mp, ptr, XFS_LBSIZE(mp), bno)) { | ||
| 145 | corrupt = true; | ||
| 146 | break; | ||
| 147 | } | ||
| 148 | len -= XFS_LBSIZE(mp); | ||
| 149 | ptr += XFS_LBSIZE(mp); | ||
| 150 | bno += mp->m_bsize; | ||
| 151 | } | ||
| 152 | |||
| 153 | if (corrupt) { | ||
| 97 | XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, bp->b_addr); | 154 | XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, bp->b_addr); |
| 98 | xfs_buf_ioerror(bp, EFSCORRUPTED); | 155 | xfs_buf_ioerror(bp, EFSCORRUPTED); |
| 99 | } | 156 | } else |
| 157 | ASSERT(len == 0); | ||
| 100 | } | 158 | } |
| 101 | 159 | ||
| 102 | static void | 160 | static void |
| @@ -105,23 +163,39 @@ xfs_attr3_rmt_write_verify( | |||
| 105 | { | 163 | { |
| 106 | struct xfs_mount *mp = bp->b_target->bt_mount; | 164 | struct xfs_mount *mp = bp->b_target->bt_mount; |
| 107 | struct xfs_buf_log_item *bip = bp->b_fspriv; | 165 | struct xfs_buf_log_item *bip = bp->b_fspriv; |
| 166 | char *ptr; | ||
| 167 | int len; | ||
| 168 | xfs_daddr_t bno; | ||
| 108 | 169 | ||
| 109 | /* no verification of non-crc buffers */ | 170 | /* no verification of non-crc buffers */ |
| 110 | if (!xfs_sb_version_hascrc(&mp->m_sb)) | 171 | if (!xfs_sb_version_hascrc(&mp->m_sb)) |
| 111 | return; | 172 | return; |
| 112 | 173 | ||
| 113 | if (!xfs_attr3_rmt_verify(bp)) { | 174 | ptr = bp->b_addr; |
| 114 | XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, bp->b_addr); | 175 | bno = bp->b_bn; |
| 115 | xfs_buf_ioerror(bp, EFSCORRUPTED); | 176 | len = BBTOB(bp->b_length); |
| 116 | return; | 177 | ASSERT(len >= XFS_LBSIZE(mp)); |
| 117 | } | 178 | |
| 179 | while (len > 0) { | ||
| 180 | if (!xfs_attr3_rmt_verify(mp, ptr, XFS_LBSIZE(mp), bno)) { | ||
| 181 | XFS_CORRUPTION_ERROR(__func__, | ||
| 182 | XFS_ERRLEVEL_LOW, mp, bp->b_addr); | ||
| 183 | xfs_buf_ioerror(bp, EFSCORRUPTED); | ||
| 184 | return; | ||
| 185 | } | ||
| 186 | if (bip) { | ||
| 187 | struct xfs_attr3_rmt_hdr *rmt; | ||
| 188 | |||
| 189 | rmt = (struct xfs_attr3_rmt_hdr *)ptr; | ||
| 190 | rmt->rm_lsn = cpu_to_be64(bip->bli_item.li_lsn); | ||
| 191 | } | ||
| 192 | xfs_update_cksum(ptr, XFS_LBSIZE(mp), XFS_ATTR3_RMT_CRC_OFF); | ||
| 118 | 193 | ||
| 119 | if (bip) { | 194 | len -= XFS_LBSIZE(mp); |
| 120 | struct xfs_attr3_rmt_hdr *rmt = bp->b_addr; | 195 | ptr += XFS_LBSIZE(mp); |
| 121 | rmt->rm_lsn = cpu_to_be64(bip->bli_item.li_lsn); | 196 | bno += mp->m_bsize; |
| 122 | } | 197 | } |
| 123 | xfs_update_cksum(bp->b_addr, BBTOB(bp->b_length), | 198 | ASSERT(len == 0); |
| 124 | XFS_ATTR3_RMT_CRC_OFF); | ||
| 125 | } | 199 | } |
| 126 | 200 | ||
| 127 | const struct xfs_buf_ops xfs_attr3_rmt_buf_ops = { | 201 | const struct xfs_buf_ops xfs_attr3_rmt_buf_ops = { |
| @@ -129,15 +203,16 @@ const struct xfs_buf_ops xfs_attr3_rmt_buf_ops = { | |||
| 129 | .verify_write = xfs_attr3_rmt_write_verify, | 203 | .verify_write = xfs_attr3_rmt_write_verify, |
| 130 | }; | 204 | }; |
| 131 | 205 | ||
| 132 | static int | 206 | STATIC int |
| 133 | xfs_attr3_rmt_hdr_set( | 207 | xfs_attr3_rmt_hdr_set( |
| 134 | struct xfs_mount *mp, | 208 | struct xfs_mount *mp, |
| 209 | void *ptr, | ||
| 135 | xfs_ino_t ino, | 210 | xfs_ino_t ino, |
| 136 | uint32_t offset, | 211 | uint32_t offset, |
| 137 | uint32_t size, | 212 | uint32_t size, |
| 138 | struct xfs_buf *bp) | 213 | xfs_daddr_t bno) |
| 139 | { | 214 | { |
| 140 | struct xfs_attr3_rmt_hdr *rmt = bp->b_addr; | 215 | struct xfs_attr3_rmt_hdr *rmt = ptr; |
| 141 | 216 | ||
| 142 | if (!xfs_sb_version_hascrc(&mp->m_sb)) | 217 | if (!xfs_sb_version_hascrc(&mp->m_sb)) |
| 143 | return 0; | 218 | return 0; |
| @@ -147,36 +222,107 @@ xfs_attr3_rmt_hdr_set( | |||
| 147 | rmt->rm_bytes = cpu_to_be32(size); | 222 | rmt->rm_bytes = cpu_to_be32(size); |
| 148 | uuid_copy(&rmt->rm_uuid, &mp->m_sb.sb_uuid); | 223 | uuid_copy(&rmt->rm_uuid, &mp->m_sb.sb_uuid); |
| 149 | rmt->rm_owner = cpu_to_be64(ino); | 224 | rmt->rm_owner = cpu_to_be64(ino); |
| 150 | rmt->rm_blkno = cpu_to_be64(bp->b_bn); | 225 | rmt->rm_blkno = cpu_to_be64(bno); |
| 151 | bp->b_ops = &xfs_attr3_rmt_buf_ops; | ||
| 152 | 226 | ||
| 153 | return sizeof(struct xfs_attr3_rmt_hdr); | 227 | return sizeof(struct xfs_attr3_rmt_hdr); |
| 154 | } | 228 | } |
| 155 | 229 | ||
| 156 | /* | 230 | /* |
| 157 | * Checking of the remote attribute header is split into two parts. the verifier | 231 | * Helper functions to copy attribute data in and out of the one disk extents |
| 158 | * does CRC, location and bounds checking, the unpacking function checks the | ||
| 159 | * attribute parameters and owner. | ||
| 160 | */ | 232 | */ |
| 161 | static bool | 233 | STATIC int |
| 162 | xfs_attr3_rmt_hdr_ok( | 234 | xfs_attr_rmtval_copyout( |
| 163 | struct xfs_mount *mp, | 235 | struct xfs_mount *mp, |
| 164 | xfs_ino_t ino, | 236 | struct xfs_buf *bp, |
| 165 | uint32_t offset, | 237 | xfs_ino_t ino, |
| 166 | uint32_t size, | 238 | int *offset, |
| 167 | struct xfs_buf *bp) | 239 | int *valuelen, |
| 240 | char **dst) | ||
| 168 | { | 241 | { |
| 169 | struct xfs_attr3_rmt_hdr *rmt = bp->b_addr; | 242 | char *src = bp->b_addr; |
| 243 | xfs_daddr_t bno = bp->b_bn; | ||
| 244 | int len = BBTOB(bp->b_length); | ||
| 170 | 245 | ||
| 171 | if (offset != be32_to_cpu(rmt->rm_offset)) | 246 | ASSERT(len >= XFS_LBSIZE(mp)); |
| 172 | return false; | ||
| 173 | if (size != be32_to_cpu(rmt->rm_bytes)) | ||
| 174 | return false; | ||
| 175 | if (ino != be64_to_cpu(rmt->rm_owner)) | ||
| 176 | return false; | ||
| 177 | 247 | ||
| 178 | /* ok */ | 248 | while (len > 0 && *valuelen > 0) { |
| 179 | return true; | 249 | int hdr_size = 0; |
| 250 | int byte_cnt = XFS_ATTR3_RMT_BUF_SPACE(mp, XFS_LBSIZE(mp)); | ||
| 251 | |||
| 252 | byte_cnt = min_t(int, *valuelen, byte_cnt); | ||
| 253 | |||
| 254 | if (xfs_sb_version_hascrc(&mp->m_sb)) { | ||
| 255 | if (!xfs_attr3_rmt_hdr_ok(mp, src, ino, *offset, | ||
| 256 | byte_cnt, bno)) { | ||
| 257 | xfs_alert(mp, | ||
| 258 | "remote attribute header mismatch bno/off/len/owner (0x%llx/0x%x/Ox%x/0x%llx)", | ||
| 259 | bno, *offset, byte_cnt, ino); | ||
| 260 | return EFSCORRUPTED; | ||
| 261 | } | ||
| 262 | hdr_size = sizeof(struct xfs_attr3_rmt_hdr); | ||
| 263 | } | ||
| 264 | |||
| 265 | memcpy(*dst, src + hdr_size, byte_cnt); | ||
| 266 | |||
| 267 | /* roll buffer forwards */ | ||
| 268 | len -= XFS_LBSIZE(mp); | ||
| 269 | src += XFS_LBSIZE(mp); | ||
| 270 | bno += mp->m_bsize; | ||
| 271 | |||
| 272 | /* roll attribute data forwards */ | ||
| 273 | *valuelen -= byte_cnt; | ||
| 274 | *dst += byte_cnt; | ||
| 275 | *offset += byte_cnt; | ||
| 276 | } | ||
| 277 | return 0; | ||
| 278 | } | ||
| 279 | |||
| 280 | STATIC void | ||
| 281 | xfs_attr_rmtval_copyin( | ||
| 282 | struct xfs_mount *mp, | ||
| 283 | struct xfs_buf *bp, | ||
| 284 | xfs_ino_t ino, | ||
| 285 | int *offset, | ||
| 286 | int *valuelen, | ||
| 287 | char **src) | ||
| 288 | { | ||
| 289 | char *dst = bp->b_addr; | ||
| 290 | xfs_daddr_t bno = bp->b_bn; | ||
| 291 | int len = BBTOB(bp->b_length); | ||
| 292 | |||
| 293 | ASSERT(len >= XFS_LBSIZE(mp)); | ||
| 294 | |||
| 295 | while (len > 0 && *valuelen > 0) { | ||
| 296 | int hdr_size; | ||
| 297 | int byte_cnt = XFS_ATTR3_RMT_BUF_SPACE(mp, XFS_LBSIZE(mp)); | ||
| 298 | |||
| 299 | byte_cnt = min(*valuelen, byte_cnt); | ||
| 300 | hdr_size = xfs_attr3_rmt_hdr_set(mp, dst, ino, *offset, | ||
| 301 | byte_cnt, bno); | ||
| 302 | |||
| 303 | memcpy(dst + hdr_size, *src, byte_cnt); | ||
| 304 | |||
| 305 | /* | ||
| 306 | * If this is the last block, zero the remainder of it. | ||
| 307 | * Check that we are actually the last block, too. | ||
| 308 | */ | ||
| 309 | if (byte_cnt + hdr_size < XFS_LBSIZE(mp)) { | ||
| 310 | ASSERT(*valuelen - byte_cnt == 0); | ||
| 311 | ASSERT(len == XFS_LBSIZE(mp)); | ||
| 312 | memset(dst + hdr_size + byte_cnt, 0, | ||
| 313 | XFS_LBSIZE(mp) - hdr_size - byte_cnt); | ||
| 314 | } | ||
| 315 | |||
| 316 | /* roll buffer forwards */ | ||
| 317 | len -= XFS_LBSIZE(mp); | ||
| 318 | dst += XFS_LBSIZE(mp); | ||
| 319 | bno += mp->m_bsize; | ||
| 320 | |||
| 321 | /* roll attribute data forwards */ | ||
| 322 | *valuelen -= byte_cnt; | ||
| 323 | *src += byte_cnt; | ||
| 324 | *offset += byte_cnt; | ||
| 325 | } | ||
| 180 | } | 326 | } |
| 181 | 327 | ||
| 182 | /* | 328 | /* |
| @@ -190,13 +336,12 @@ xfs_attr_rmtval_get( | |||
| 190 | struct xfs_bmbt_irec map[ATTR_RMTVALUE_MAPSIZE]; | 336 | struct xfs_bmbt_irec map[ATTR_RMTVALUE_MAPSIZE]; |
| 191 | struct xfs_mount *mp = args->dp->i_mount; | 337 | struct xfs_mount *mp = args->dp->i_mount; |
| 192 | struct xfs_buf *bp; | 338 | struct xfs_buf *bp; |
| 193 | xfs_daddr_t dblkno; | ||
| 194 | xfs_dablk_t lblkno = args->rmtblkno; | 339 | xfs_dablk_t lblkno = args->rmtblkno; |
| 195 | void *dst = args->value; | 340 | char *dst = args->value; |
| 196 | int valuelen = args->valuelen; | 341 | int valuelen = args->valuelen; |
| 197 | int nmap; | 342 | int nmap; |
| 198 | int error; | 343 | int error; |
| 199 | int blkcnt; | 344 | int blkcnt = args->rmtblkcnt; |
| 200 | int i; | 345 | int i; |
| 201 | int offset = 0; | 346 | int offset = 0; |
| 202 | 347 | ||
| @@ -207,52 +352,36 @@ xfs_attr_rmtval_get( | |||
| 207 | while (valuelen > 0) { | 352 | while (valuelen > 0) { |
| 208 | nmap = ATTR_RMTVALUE_MAPSIZE; | 353 | nmap = ATTR_RMTVALUE_MAPSIZE; |
| 209 | error = xfs_bmapi_read(args->dp, (xfs_fileoff_t)lblkno, | 354 | error = xfs_bmapi_read(args->dp, (xfs_fileoff_t)lblkno, |
| 210 | args->rmtblkcnt, map, &nmap, | 355 | blkcnt, map, &nmap, |
| 211 | XFS_BMAPI_ATTRFORK); | 356 | XFS_BMAPI_ATTRFORK); |
| 212 | if (error) | 357 | if (error) |
| 213 | return error; | 358 | return error; |
| 214 | ASSERT(nmap >= 1); | 359 | ASSERT(nmap >= 1); |
| 215 | 360 | ||
| 216 | for (i = 0; (i < nmap) && (valuelen > 0); i++) { | 361 | for (i = 0; (i < nmap) && (valuelen > 0); i++) { |
| 217 | int byte_cnt; | 362 | xfs_daddr_t dblkno; |
| 218 | char *src; | 363 | int dblkcnt; |
| 219 | 364 | ||
| 220 | ASSERT((map[i].br_startblock != DELAYSTARTBLOCK) && | 365 | ASSERT((map[i].br_startblock != DELAYSTARTBLOCK) && |
| 221 | (map[i].br_startblock != HOLESTARTBLOCK)); | 366 | (map[i].br_startblock != HOLESTARTBLOCK)); |
| 222 | dblkno = XFS_FSB_TO_DADDR(mp, map[i].br_startblock); | 367 | dblkno = XFS_FSB_TO_DADDR(mp, map[i].br_startblock); |
| 223 | blkcnt = XFS_FSB_TO_BB(mp, map[i].br_blockcount); | 368 | dblkcnt = XFS_FSB_TO_BB(mp, map[i].br_blockcount); |
| 224 | error = xfs_trans_read_buf(mp, NULL, mp->m_ddev_targp, | 369 | error = xfs_trans_read_buf(mp, NULL, mp->m_ddev_targp, |
| 225 | dblkno, blkcnt, 0, &bp, | 370 | dblkno, dblkcnt, 0, &bp, |
| 226 | &xfs_attr3_rmt_buf_ops); | 371 | &xfs_attr3_rmt_buf_ops); |
| 227 | if (error) | 372 | if (error) |
| 228 | return error; | 373 | return error; |
| 229 | 374 | ||
| 230 | byte_cnt = min_t(int, valuelen, BBTOB(bp->b_length)); | 375 | error = xfs_attr_rmtval_copyout(mp, bp, args->dp->i_ino, |
| 231 | byte_cnt = XFS_ATTR3_RMT_BUF_SPACE(mp, byte_cnt); | 376 | &offset, &valuelen, |
| 232 | 377 | &dst); | |
| 233 | src = bp->b_addr; | ||
| 234 | if (xfs_sb_version_hascrc(&mp->m_sb)) { | ||
| 235 | if (!xfs_attr3_rmt_hdr_ok(mp, args->dp->i_ino, | ||
| 236 | offset, byte_cnt, bp)) { | ||
| 237 | xfs_alert(mp, | ||
| 238 | "remote attribute header does not match required off/len/owner (0x%x/Ox%x,0x%llx)", | ||
| 239 | offset, byte_cnt, args->dp->i_ino); | ||
| 240 | xfs_buf_relse(bp); | ||
| 241 | return EFSCORRUPTED; | ||
| 242 | |||
| 243 | } | ||
| 244 | |||
| 245 | src += sizeof(struct xfs_attr3_rmt_hdr); | ||
| 246 | } | ||
| 247 | |||
| 248 | memcpy(dst, src, byte_cnt); | ||
| 249 | xfs_buf_relse(bp); | 378 | xfs_buf_relse(bp); |
| 379 | if (error) | ||
| 380 | return error; | ||
| 250 | 381 | ||
| 251 | offset += byte_cnt; | 382 | /* roll attribute extent map forwards */ |
| 252 | dst += byte_cnt; | ||
| 253 | valuelen -= byte_cnt; | ||
| 254 | |||
| 255 | lblkno += map[i].br_blockcount; | 383 | lblkno += map[i].br_blockcount; |
| 384 | blkcnt -= map[i].br_blockcount; | ||
| 256 | } | 385 | } |
| 257 | } | 386 | } |
| 258 | ASSERT(valuelen == 0); | 387 | ASSERT(valuelen == 0); |
| @@ -270,17 +399,13 @@ xfs_attr_rmtval_set( | |||
| 270 | struct xfs_inode *dp = args->dp; | 399 | struct xfs_inode *dp = args->dp; |
| 271 | struct xfs_mount *mp = dp->i_mount; | 400 | struct xfs_mount *mp = dp->i_mount; |
| 272 | struct xfs_bmbt_irec map; | 401 | struct xfs_bmbt_irec map; |
| 273 | struct xfs_buf *bp; | ||
| 274 | xfs_daddr_t dblkno; | ||
| 275 | xfs_dablk_t lblkno; | 402 | xfs_dablk_t lblkno; |
| 276 | xfs_fileoff_t lfileoff = 0; | 403 | xfs_fileoff_t lfileoff = 0; |
| 277 | void *src = args->value; | 404 | char *src = args->value; |
| 278 | int blkcnt; | 405 | int blkcnt; |
| 279 | int valuelen; | 406 | int valuelen; |
| 280 | int nmap; | 407 | int nmap; |
| 281 | int error; | 408 | int error; |
| 282 | int hdrcnt = 0; | ||
| 283 | bool crcs = xfs_sb_version_hascrc(&mp->m_sb); | ||
| 284 | int offset = 0; | 409 | int offset = 0; |
| 285 | 410 | ||
| 286 | trace_xfs_attr_rmtval_set(args); | 411 | trace_xfs_attr_rmtval_set(args); |
| @@ -289,24 +414,14 @@ xfs_attr_rmtval_set( | |||
| 289 | * Find a "hole" in the attribute address space large enough for | 414 | * Find a "hole" in the attribute address space large enough for |
| 290 | * us to drop the new attribute's value into. Because CRC enable | 415 | * us to drop the new attribute's value into. Because CRC enable |
| 291 | * attributes have headers, we can't just do a straight byte to FSB | 416 | * attributes have headers, we can't just do a straight byte to FSB |
| 292 | * conversion. We calculate the worst case block count in this case | 417 | * conversion and have to take the header space into account. |
| 293 | * and we may not need that many, so we have to handle this when | ||
| 294 | * allocating the blocks below. | ||
| 295 | */ | 418 | */ |
| 296 | if (!crcs) | 419 | blkcnt = xfs_attr3_rmt_blocks(mp, args->valuelen); |
| 297 | blkcnt = XFS_B_TO_FSB(mp, args->valuelen); | ||
| 298 | else | ||
| 299 | blkcnt = xfs_attr3_rmt_blocks(mp, args->valuelen); | ||
| 300 | |||
| 301 | error = xfs_bmap_first_unused(args->trans, args->dp, blkcnt, &lfileoff, | 420 | error = xfs_bmap_first_unused(args->trans, args->dp, blkcnt, &lfileoff, |
| 302 | XFS_ATTR_FORK); | 421 | XFS_ATTR_FORK); |
| 303 | if (error) | 422 | if (error) |
| 304 | return error; | 423 | return error; |
| 305 | 424 | ||
| 306 | /* Start with the attribute data. We'll allocate the rest afterwards. */ | ||
| 307 | if (crcs) | ||
| 308 | blkcnt = XFS_B_TO_FSB(mp, args->valuelen); | ||
| 309 | |||
| 310 | args->rmtblkno = lblkno = (xfs_dablk_t)lfileoff; | 425 | args->rmtblkno = lblkno = (xfs_dablk_t)lfileoff; |
| 311 | args->rmtblkcnt = blkcnt; | 426 | args->rmtblkcnt = blkcnt; |
| 312 | 427 | ||
| @@ -349,26 +464,6 @@ xfs_attr_rmtval_set( | |||
| 349 | (map.br_startblock != HOLESTARTBLOCK)); | 464 | (map.br_startblock != HOLESTARTBLOCK)); |
| 350 | lblkno += map.br_blockcount; | 465 | lblkno += map.br_blockcount; |
| 351 | blkcnt -= map.br_blockcount; | 466 | blkcnt -= map.br_blockcount; |
| 352 | hdrcnt++; | ||
| 353 | |||
| 354 | /* | ||
| 355 | * If we have enough blocks for the attribute data, calculate | ||
| 356 | * how many extra blocks we need for headers. We might run | ||
| 357 | * through this multiple times in the case that the additional | ||
| 358 | * headers in the blocks needed for the data fragments spills | ||
| 359 | * into requiring more blocks. e.g. for 512 byte blocks, we'll | ||
| 360 | * spill for another block every 9 headers we require in this | ||
| 361 | * loop. | ||
| 362 | */ | ||
| 363 | if (crcs && blkcnt == 0) { | ||
| 364 | int total_len; | ||
| 365 | |||
| 366 | total_len = args->valuelen + | ||
| 367 | hdrcnt * sizeof(struct xfs_attr3_rmt_hdr); | ||
| 368 | blkcnt = XFS_B_TO_FSB(mp, total_len); | ||
| 369 | blkcnt -= args->rmtblkcnt; | ||
| 370 | args->rmtblkcnt += blkcnt; | ||
| 371 | } | ||
| 372 | 467 | ||
| 373 | /* | 468 | /* |
| 374 | * Start the next trans in the chain. | 469 | * Start the next trans in the chain. |
| @@ -385,18 +480,19 @@ xfs_attr_rmtval_set( | |||
| 385 | * the INCOMPLETE flag. | 480 | * the INCOMPLETE flag. |
| 386 | */ | 481 | */ |
| 387 | lblkno = args->rmtblkno; | 482 | lblkno = args->rmtblkno; |
| 483 | blkcnt = args->rmtblkcnt; | ||
| 388 | valuelen = args->valuelen; | 484 | valuelen = args->valuelen; |
| 389 | while (valuelen > 0) { | 485 | while (valuelen > 0) { |
| 390 | int byte_cnt; | 486 | struct xfs_buf *bp; |
| 391 | char *buf; | 487 | xfs_daddr_t dblkno; |
| 488 | int dblkcnt; | ||
| 489 | |||
| 490 | ASSERT(blkcnt > 0); | ||
| 392 | 491 | ||
| 393 | /* | ||
| 394 | * Try to remember where we decided to put the value. | ||
| 395 | */ | ||
| 396 | xfs_bmap_init(args->flist, args->firstblock); | 492 | xfs_bmap_init(args->flist, args->firstblock); |
| 397 | nmap = 1; | 493 | nmap = 1; |
| 398 | error = xfs_bmapi_read(dp, (xfs_fileoff_t)lblkno, | 494 | error = xfs_bmapi_read(dp, (xfs_fileoff_t)lblkno, |
| 399 | args->rmtblkcnt, &map, &nmap, | 495 | blkcnt, &map, &nmap, |
| 400 | XFS_BMAPI_ATTRFORK); | 496 | XFS_BMAPI_ATTRFORK); |
| 401 | if (error) | 497 | if (error) |
| 402 | return(error); | 498 | return(error); |
| @@ -405,41 +501,27 @@ xfs_attr_rmtval_set( | |||
| 405 | (map.br_startblock != HOLESTARTBLOCK)); | 501 | (map.br_startblock != HOLESTARTBLOCK)); |
| 406 | 502 | ||
| 407 | dblkno = XFS_FSB_TO_DADDR(mp, map.br_startblock), | 503 | dblkno = XFS_FSB_TO_DADDR(mp, map.br_startblock), |
| 408 | blkcnt = XFS_FSB_TO_BB(mp, map.br_blockcount); | 504 | dblkcnt = XFS_FSB_TO_BB(mp, map.br_blockcount); |
| 409 | 505 | ||
| 410 | bp = xfs_buf_get(mp->m_ddev_targp, dblkno, blkcnt, 0); | 506 | bp = xfs_buf_get(mp->m_ddev_targp, dblkno, dblkcnt, 0); |
| 411 | if (!bp) | 507 | if (!bp) |
| 412 | return ENOMEM; | 508 | return ENOMEM; |
| 413 | bp->b_ops = &xfs_attr3_rmt_buf_ops; | 509 | bp->b_ops = &xfs_attr3_rmt_buf_ops; |
| 414 | 510 | ||
| 415 | byte_cnt = BBTOB(bp->b_length); | 511 | xfs_attr_rmtval_copyin(mp, bp, args->dp->i_ino, &offset, |
| 416 | byte_cnt = XFS_ATTR3_RMT_BUF_SPACE(mp, byte_cnt); | 512 | &valuelen, &src); |
| 417 | if (valuelen < byte_cnt) | ||
| 418 | byte_cnt = valuelen; | ||
| 419 | |||
| 420 | buf = bp->b_addr; | ||
| 421 | buf += xfs_attr3_rmt_hdr_set(mp, dp->i_ino, offset, | ||
| 422 | byte_cnt, bp); | ||
| 423 | memcpy(buf, src, byte_cnt); | ||
| 424 | |||
| 425 | if (byte_cnt < BBTOB(bp->b_length)) | ||
| 426 | xfs_buf_zero(bp, byte_cnt, | ||
| 427 | BBTOB(bp->b_length) - byte_cnt); | ||
| 428 | 513 | ||
| 429 | error = xfs_bwrite(bp); /* GROT: NOTE: synchronous write */ | 514 | error = xfs_bwrite(bp); /* GROT: NOTE: synchronous write */ |
| 430 | xfs_buf_relse(bp); | 515 | xfs_buf_relse(bp); |
| 431 | if (error) | 516 | if (error) |
| 432 | return error; | 517 | return error; |
| 433 | 518 | ||
| 434 | src += byte_cnt; | ||
| 435 | valuelen -= byte_cnt; | ||
| 436 | offset += byte_cnt; | ||
| 437 | hdrcnt--; | ||
| 438 | 519 | ||
| 520 | /* roll attribute extent map forwards */ | ||
| 439 | lblkno += map.br_blockcount; | 521 | lblkno += map.br_blockcount; |
| 522 | blkcnt -= map.br_blockcount; | ||
| 440 | } | 523 | } |
| 441 | ASSERT(valuelen == 0); | 524 | ASSERT(valuelen == 0); |
| 442 | ASSERT(hdrcnt == 0); | ||
| 443 | return 0; | 525 | return 0; |
| 444 | } | 526 | } |
| 445 | 527 | ||
| @@ -448,33 +530,40 @@ xfs_attr_rmtval_set( | |||
| 448 | * out-of-line buffer that it is stored on. | 530 | * out-of-line buffer that it is stored on. |
| 449 | */ | 531 | */ |
| 450 | int | 532 | int |
| 451 | xfs_attr_rmtval_remove(xfs_da_args_t *args) | 533 | xfs_attr_rmtval_remove( |
| 534 | struct xfs_da_args *args) | ||
| 452 | { | 535 | { |
| 453 | xfs_mount_t *mp; | 536 | struct xfs_mount *mp = args->dp->i_mount; |
| 454 | xfs_bmbt_irec_t map; | 537 | xfs_dablk_t lblkno; |
| 455 | xfs_buf_t *bp; | 538 | int blkcnt; |
| 456 | xfs_daddr_t dblkno; | 539 | int error; |
| 457 | xfs_dablk_t lblkno; | 540 | int done; |
| 458 | int valuelen, blkcnt, nmap, error, done, committed; | ||
| 459 | 541 | ||
| 460 | trace_xfs_attr_rmtval_remove(args); | 542 | trace_xfs_attr_rmtval_remove(args); |
| 461 | 543 | ||
| 462 | mp = args->dp->i_mount; | ||
| 463 | |||
| 464 | /* | 544 | /* |
| 465 | * Roll through the "value", invalidating the attribute value's | 545 | * Roll through the "value", invalidating the attribute value's blocks. |
| 466 | * blocks. | 546 | * Note that args->rmtblkcnt is the minimum number of data blocks we'll |
| 547 | * see for a CRC enabled remote attribute. Each extent will have a | ||
| 548 | * header, and so we may have more blocks than we realise here. If we | ||
| 549 | * fail to map the blocks correctly, we'll have problems with the buffer | ||
| 550 | * lookups. | ||
| 467 | */ | 551 | */ |
| 468 | lblkno = args->rmtblkno; | 552 | lblkno = args->rmtblkno; |
| 469 | valuelen = args->rmtblkcnt; | 553 | blkcnt = args->rmtblkcnt; |
| 470 | while (valuelen > 0) { | 554 | while (blkcnt > 0) { |
| 555 | struct xfs_bmbt_irec map; | ||
| 556 | struct xfs_buf *bp; | ||
| 557 | xfs_daddr_t dblkno; | ||
| 558 | int dblkcnt; | ||
| 559 | int nmap; | ||
| 560 | |||
| 471 | /* | 561 | /* |
| 472 | * Try to remember where we decided to put the value. | 562 | * Try to remember where we decided to put the value. |
| 473 | */ | 563 | */ |
| 474 | nmap = 1; | 564 | nmap = 1; |
| 475 | error = xfs_bmapi_read(args->dp, (xfs_fileoff_t)lblkno, | 565 | error = xfs_bmapi_read(args->dp, (xfs_fileoff_t)lblkno, |
| 476 | args->rmtblkcnt, &map, &nmap, | 566 | blkcnt, &map, &nmap, XFS_BMAPI_ATTRFORK); |
| 477 | XFS_BMAPI_ATTRFORK); | ||
| 478 | if (error) | 567 | if (error) |
| 479 | return(error); | 568 | return(error); |
| 480 | ASSERT(nmap == 1); | 569 | ASSERT(nmap == 1); |
| @@ -482,21 +571,20 @@ xfs_attr_rmtval_remove(xfs_da_args_t *args) | |||
| 482 | (map.br_startblock != HOLESTARTBLOCK)); | 571 | (map.br_startblock != HOLESTARTBLOCK)); |
| 483 | 572 | ||
| 484 | dblkno = XFS_FSB_TO_DADDR(mp, map.br_startblock), | 573 | dblkno = XFS_FSB_TO_DADDR(mp, map.br_startblock), |
| 485 | blkcnt = XFS_FSB_TO_BB(mp, map.br_blockcount); | 574 | dblkcnt = XFS_FSB_TO_BB(mp, map.br_blockcount); |
| 486 | 575 | ||
| 487 | /* | 576 | /* |
| 488 | * If the "remote" value is in the cache, remove it. | 577 | * If the "remote" value is in the cache, remove it. |
| 489 | */ | 578 | */ |
| 490 | bp = xfs_incore(mp->m_ddev_targp, dblkno, blkcnt, XBF_TRYLOCK); | 579 | bp = xfs_incore(mp->m_ddev_targp, dblkno, dblkcnt, XBF_TRYLOCK); |
| 491 | if (bp) { | 580 | if (bp) { |
| 492 | xfs_buf_stale(bp); | 581 | xfs_buf_stale(bp); |
| 493 | xfs_buf_relse(bp); | 582 | xfs_buf_relse(bp); |
| 494 | bp = NULL; | 583 | bp = NULL; |
| 495 | } | 584 | } |
| 496 | 585 | ||
| 497 | valuelen -= map.br_blockcount; | ||
| 498 | |||
| 499 | lblkno += map.br_blockcount; | 586 | lblkno += map.br_blockcount; |
| 587 | blkcnt -= map.br_blockcount; | ||
| 500 | } | 588 | } |
| 501 | 589 | ||
| 502 | /* | 590 | /* |
| @@ -506,6 +594,8 @@ xfs_attr_rmtval_remove(xfs_da_args_t *args) | |||
| 506 | blkcnt = args->rmtblkcnt; | 594 | blkcnt = args->rmtblkcnt; |
| 507 | done = 0; | 595 | done = 0; |
| 508 | while (!done) { | 596 | while (!done) { |
| 597 | int committed; | ||
| 598 | |||
| 509 | xfs_bmap_init(args->flist, args->firstblock); | 599 | xfs_bmap_init(args->flist, args->firstblock); |
| 510 | error = xfs_bunmapi(args->trans, args->dp, lblkno, blkcnt, | 600 | error = xfs_bunmapi(args->trans, args->dp, lblkno, blkcnt, |
| 511 | XFS_BMAPI_ATTRFORK | XFS_BMAPI_METADATA, | 601 | XFS_BMAPI_ATTRFORK | XFS_BMAPI_METADATA, |
diff --git a/fs/xfs/xfs_attr_remote.h b/fs/xfs/xfs_attr_remote.h index c7cca60a062a..92a8fd7977cc 100644 --- a/fs/xfs/xfs_attr_remote.h +++ b/fs/xfs/xfs_attr_remote.h | |||
| @@ -20,6 +20,14 @@ | |||
| 20 | 20 | ||
| 21 | #define XFS_ATTR3_RMT_MAGIC 0x5841524d /* XARM */ | 21 | #define XFS_ATTR3_RMT_MAGIC 0x5841524d /* XARM */ |
| 22 | 22 | ||
| 23 | /* | ||
| 24 | * There is one of these headers per filesystem block in a remote attribute. | ||
| 25 | * This is done to ensure there is a 1:1 mapping between the attribute value | ||
| 26 | * length and the number of blocks needed to store the attribute. This makes the | ||
| 27 | * verification of a buffer a little more complex, but greatly simplifies the | ||
| 28 | * allocation, reading and writing of these attributes as we don't have to guess | ||
| 29 | * the number of blocks needed to store the attribute data. | ||
| 30 | */ | ||
| 23 | struct xfs_attr3_rmt_hdr { | 31 | struct xfs_attr3_rmt_hdr { |
| 24 | __be32 rm_magic; | 32 | __be32 rm_magic; |
| 25 | __be32 rm_offset; | 33 | __be32 rm_offset; |
| @@ -39,6 +47,8 @@ struct xfs_attr3_rmt_hdr { | |||
| 39 | 47 | ||
| 40 | extern const struct xfs_buf_ops xfs_attr3_rmt_buf_ops; | 48 | extern const struct xfs_buf_ops xfs_attr3_rmt_buf_ops; |
| 41 | 49 | ||
| 50 | int xfs_attr3_rmt_blocks(struct xfs_mount *mp, int attrlen); | ||
| 51 | |||
| 42 | int xfs_attr_rmtval_get(struct xfs_da_args *args); | 52 | int xfs_attr_rmtval_get(struct xfs_da_args *args); |
| 43 | int xfs_attr_rmtval_set(struct xfs_da_args *args); | 53 | int xfs_attr_rmtval_set(struct xfs_da_args *args); |
| 44 | int xfs_attr_rmtval_remove(struct xfs_da_args *args); | 54 | int xfs_attr_rmtval_remove(struct xfs_da_args *args); |
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index 0d2554299688..1b2472a46e46 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c | |||
| @@ -513,6 +513,7 @@ _xfs_buf_find( | |||
| 513 | xfs_alert(btp->bt_mount, | 513 | xfs_alert(btp->bt_mount, |
| 514 | "%s: Block out of range: block 0x%llx, EOFS 0x%llx ", | 514 | "%s: Block out of range: block 0x%llx, EOFS 0x%llx ", |
| 515 | __func__, blkno, eofs); | 515 | __func__, blkno, eofs); |
| 516 | WARN_ON(1); | ||
| 516 | return NULL; | 517 | return NULL; |
| 517 | } | 518 | } |
| 518 | 519 | ||
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c index cf263476d6b4..4ec431777048 100644 --- a/fs/xfs/xfs_buf_item.c +++ b/fs/xfs/xfs_buf_item.c | |||
| @@ -262,12 +262,7 @@ xfs_buf_item_format_segment( | |||
| 262 | vecp->i_addr = xfs_buf_offset(bp, buffer_offset); | 262 | vecp->i_addr = xfs_buf_offset(bp, buffer_offset); |
| 263 | vecp->i_len = nbits * XFS_BLF_CHUNK; | 263 | vecp->i_len = nbits * XFS_BLF_CHUNK; |
| 264 | vecp->i_type = XLOG_REG_TYPE_BCHUNK; | 264 | vecp->i_type = XLOG_REG_TYPE_BCHUNK; |
| 265 | /* | 265 | nvecs++; |
| 266 | * You would think we need to bump the nvecs here too, but we do not | ||
| 267 | * this number is used by recovery, and it gets confused by the boundary | ||
| 268 | * split here | ||
| 269 | * nvecs++; | ||
| 270 | */ | ||
| 271 | vecp++; | 266 | vecp++; |
| 272 | first_bit = next_bit; | 267 | first_bit = next_bit; |
| 273 | last_bit = next_bit; | 268 | last_bit = next_bit; |
diff --git a/fs/xfs/xfs_dfrag.c b/fs/xfs/xfs_dfrag.c index f852b082a084..c407e1ccff43 100644 --- a/fs/xfs/xfs_dfrag.c +++ b/fs/xfs/xfs_dfrag.c | |||
| @@ -219,6 +219,14 @@ xfs_swap_extents( | |||
| 219 | int taforkblks = 0; | 219 | int taforkblks = 0; |
| 220 | __uint64_t tmp; | 220 | __uint64_t tmp; |
| 221 | 221 | ||
| 222 | /* | ||
| 223 | * We have no way of updating owner information in the BMBT blocks for | ||
| 224 | * each inode on CRC enabled filesystems, so to avoid corrupting the | ||
| 225 | * this metadata we simply don't allow extent swaps to occur. | ||
| 226 | */ | ||
| 227 | if (xfs_sb_version_hascrc(&mp->m_sb)) | ||
| 228 | return XFS_ERROR(EINVAL); | ||
| 229 | |||
| 222 | tempifp = kmem_alloc(sizeof(xfs_ifork_t), KM_MAYFAIL); | 230 | tempifp = kmem_alloc(sizeof(xfs_ifork_t), KM_MAYFAIL); |
| 223 | if (!tempifp) { | 231 | if (!tempifp) { |
| 224 | error = XFS_ERROR(ENOMEM); | 232 | error = XFS_ERROR(ENOMEM); |
diff --git a/fs/xfs/xfs_dir2_format.h b/fs/xfs/xfs_dir2_format.h index a3b1bd841a80..995f1f505a52 100644 --- a/fs/xfs/xfs_dir2_format.h +++ b/fs/xfs/xfs_dir2_format.h | |||
| @@ -715,6 +715,7 @@ struct xfs_dir3_free_hdr { | |||
| 715 | __be32 firstdb; /* db of first entry */ | 715 | __be32 firstdb; /* db of first entry */ |
| 716 | __be32 nvalid; /* count of valid entries */ | 716 | __be32 nvalid; /* count of valid entries */ |
| 717 | __be32 nused; /* count of used entries */ | 717 | __be32 nused; /* count of used entries */ |
| 718 | __be32 pad; /* 64 bit alignment. */ | ||
| 718 | }; | 719 | }; |
| 719 | 720 | ||
| 720 | struct xfs_dir3_free { | 721 | struct xfs_dir3_free { |
diff --git a/fs/xfs/xfs_dir2_node.c b/fs/xfs/xfs_dir2_node.c index 5246de4912d4..2226a00acd15 100644 --- a/fs/xfs/xfs_dir2_node.c +++ b/fs/xfs/xfs_dir2_node.c | |||
| @@ -263,18 +263,19 @@ xfs_dir3_free_get_buf( | |||
| 263 | * Initialize the new block to be empty, and remember | 263 | * Initialize the new block to be empty, and remember |
| 264 | * its first slot as our empty slot. | 264 | * its first slot as our empty slot. |
| 265 | */ | 265 | */ |
| 266 | hdr.magic = XFS_DIR2_FREE_MAGIC; | 266 | memset(bp->b_addr, 0, sizeof(struct xfs_dir3_free_hdr)); |
| 267 | hdr.firstdb = 0; | 267 | memset(&hdr, 0, sizeof(hdr)); |
| 268 | hdr.nused = 0; | 268 | |
| 269 | hdr.nvalid = 0; | ||
| 270 | if (xfs_sb_version_hascrc(&mp->m_sb)) { | 269 | if (xfs_sb_version_hascrc(&mp->m_sb)) { |
| 271 | struct xfs_dir3_free_hdr *hdr3 = bp->b_addr; | 270 | struct xfs_dir3_free_hdr *hdr3 = bp->b_addr; |
| 272 | 271 | ||
| 273 | hdr.magic = XFS_DIR3_FREE_MAGIC; | 272 | hdr.magic = XFS_DIR3_FREE_MAGIC; |
| 273 | |||
| 274 | hdr3->hdr.blkno = cpu_to_be64(bp->b_bn); | 274 | hdr3->hdr.blkno = cpu_to_be64(bp->b_bn); |
| 275 | hdr3->hdr.owner = cpu_to_be64(dp->i_ino); | 275 | hdr3->hdr.owner = cpu_to_be64(dp->i_ino); |
| 276 | uuid_copy(&hdr3->hdr.uuid, &mp->m_sb.sb_uuid); | 276 | uuid_copy(&hdr3->hdr.uuid, &mp->m_sb.sb_uuid); |
| 277 | } | 277 | } else |
| 278 | hdr.magic = XFS_DIR2_FREE_MAGIC; | ||
| 278 | xfs_dir3_free_hdr_to_disk(bp->b_addr, &hdr); | 279 | xfs_dir3_free_hdr_to_disk(bp->b_addr, &hdr); |
| 279 | *bpp = bp; | 280 | *bpp = bp; |
| 280 | return 0; | 281 | return 0; |
| @@ -1921,8 +1922,6 @@ xfs_dir2_node_addname_int( | |||
| 1921 | */ | 1922 | */ |
| 1922 | freehdr.firstdb = (fbno - XFS_DIR2_FREE_FIRSTDB(mp)) * | 1923 | freehdr.firstdb = (fbno - XFS_DIR2_FREE_FIRSTDB(mp)) * |
| 1923 | xfs_dir3_free_max_bests(mp); | 1924 | xfs_dir3_free_max_bests(mp); |
| 1924 | free->hdr.nvalid = 0; | ||
| 1925 | free->hdr.nused = 0; | ||
| 1926 | } else { | 1925 | } else { |
| 1927 | free = fbp->b_addr; | 1926 | free = fbp->b_addr; |
| 1928 | bests = xfs_dir3_free_bests_p(mp, free); | 1927 | bests = xfs_dir3_free_bests_p(mp, free); |
diff --git a/fs/xfs/xfs_fs.h b/fs/xfs/xfs_fs.h index 6dda3f949b04..d04695545397 100644 --- a/fs/xfs/xfs_fs.h +++ b/fs/xfs/xfs_fs.h | |||
| @@ -236,6 +236,7 @@ typedef struct xfs_fsop_resblks { | |||
| 236 | #define XFS_FSOP_GEOM_FLAGS_PROJID32 0x0800 /* 32-bit project IDs */ | 236 | #define XFS_FSOP_GEOM_FLAGS_PROJID32 0x0800 /* 32-bit project IDs */ |
| 237 | #define XFS_FSOP_GEOM_FLAGS_DIRV2CI 0x1000 /* ASCII only CI names */ | 237 | #define XFS_FSOP_GEOM_FLAGS_DIRV2CI 0x1000 /* ASCII only CI names */ |
| 238 | #define XFS_FSOP_GEOM_FLAGS_LAZYSB 0x4000 /* lazy superblock counters */ | 238 | #define XFS_FSOP_GEOM_FLAGS_LAZYSB 0x4000 /* lazy superblock counters */ |
| 239 | #define XFS_FSOP_GEOM_FLAGS_V5SB 0x8000 /* version 5 superblock */ | ||
| 239 | 240 | ||
| 240 | 241 | ||
| 241 | /* | 242 | /* |
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c index 87595b211da1..3c3644ea825b 100644 --- a/fs/xfs/xfs_fsops.c +++ b/fs/xfs/xfs_fsops.c | |||
| @@ -99,7 +99,9 @@ xfs_fs_geometry( | |||
| 99 | (xfs_sb_version_hasattr2(&mp->m_sb) ? | 99 | (xfs_sb_version_hasattr2(&mp->m_sb) ? |
| 100 | XFS_FSOP_GEOM_FLAGS_ATTR2 : 0) | | 100 | XFS_FSOP_GEOM_FLAGS_ATTR2 : 0) | |
| 101 | (xfs_sb_version_hasprojid32bit(&mp->m_sb) ? | 101 | (xfs_sb_version_hasprojid32bit(&mp->m_sb) ? |
| 102 | XFS_FSOP_GEOM_FLAGS_PROJID32 : 0); | 102 | XFS_FSOP_GEOM_FLAGS_PROJID32 : 0) | |
| 103 | (xfs_sb_version_hascrc(&mp->m_sb) ? | ||
| 104 | XFS_FSOP_GEOM_FLAGS_V5SB : 0); | ||
| 103 | geo->logsectsize = xfs_sb_version_hassector(&mp->m_sb) ? | 105 | geo->logsectsize = xfs_sb_version_hassector(&mp->m_sb) ? |
| 104 | mp->m_sb.sb_logsectsize : BBSIZE; | 106 | mp->m_sb.sb_logsectsize : BBSIZE; |
| 105 | geo->rtsectsize = mp->m_sb.sb_blocksize; | 107 | geo->rtsectsize = mp->m_sb.sb_blocksize; |
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index d82efaa2ac73..ca9ecaa81112 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c | |||
| @@ -455,6 +455,28 @@ xfs_vn_getattr( | |||
| 455 | return 0; | 455 | return 0; |
| 456 | } | 456 | } |
| 457 | 457 | ||
| 458 | static void | ||
| 459 | xfs_setattr_mode( | ||
| 460 | struct xfs_trans *tp, | ||
| 461 | struct xfs_inode *ip, | ||
| 462 | struct iattr *iattr) | ||
| 463 | { | ||
| 464 | struct inode *inode = VFS_I(ip); | ||
| 465 | umode_t mode = iattr->ia_mode; | ||
| 466 | |||
| 467 | ASSERT(tp); | ||
| 468 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); | ||
| 469 | |||
| 470 | if (!in_group_p(inode->i_gid) && !capable(CAP_FSETID)) | ||
| 471 | mode &= ~S_ISGID; | ||
| 472 | |||
| 473 | ip->i_d.di_mode &= S_IFMT; | ||
| 474 | ip->i_d.di_mode |= mode & ~S_IFMT; | ||
| 475 | |||
| 476 | inode->i_mode &= S_IFMT; | ||
| 477 | inode->i_mode |= mode & ~S_IFMT; | ||
| 478 | } | ||
| 479 | |||
| 458 | int | 480 | int |
| 459 | xfs_setattr_nonsize( | 481 | xfs_setattr_nonsize( |
| 460 | struct xfs_inode *ip, | 482 | struct xfs_inode *ip, |
| @@ -606,18 +628,8 @@ xfs_setattr_nonsize( | |||
| 606 | /* | 628 | /* |
| 607 | * Change file access modes. | 629 | * Change file access modes. |
| 608 | */ | 630 | */ |
| 609 | if (mask & ATTR_MODE) { | 631 | if (mask & ATTR_MODE) |
| 610 | umode_t mode = iattr->ia_mode; | 632 | xfs_setattr_mode(tp, ip, iattr); |
| 611 | |||
| 612 | if (!in_group_p(inode->i_gid) && !capable(CAP_FSETID)) | ||
| 613 | mode &= ~S_ISGID; | ||
| 614 | |||
| 615 | ip->i_d.di_mode &= S_IFMT; | ||
| 616 | ip->i_d.di_mode |= mode & ~S_IFMT; | ||
| 617 | |||
| 618 | inode->i_mode &= S_IFMT; | ||
| 619 | inode->i_mode |= mode & ~S_IFMT; | ||
| 620 | } | ||
| 621 | 633 | ||
| 622 | /* | 634 | /* |
| 623 | * Change file access or modified times. | 635 | * Change file access or modified times. |
| @@ -714,9 +726,8 @@ xfs_setattr_size( | |||
| 714 | return XFS_ERROR(error); | 726 | return XFS_ERROR(error); |
| 715 | 727 | ||
| 716 | ASSERT(S_ISREG(ip->i_d.di_mode)); | 728 | ASSERT(S_ISREG(ip->i_d.di_mode)); |
| 717 | ASSERT((mask & (ATTR_MODE|ATTR_UID|ATTR_GID|ATTR_ATIME|ATTR_ATIME_SET| | 729 | ASSERT((mask & (ATTR_UID|ATTR_GID|ATTR_ATIME|ATTR_ATIME_SET| |
| 718 | ATTR_MTIME_SET|ATTR_KILL_SUID|ATTR_KILL_SGID| | 730 | ATTR_MTIME_SET|ATTR_KILL_PRIV|ATTR_TIMES_SET)) == 0); |
| 719 | ATTR_KILL_PRIV|ATTR_TIMES_SET)) == 0); | ||
| 720 | 731 | ||
| 721 | if (!(flags & XFS_ATTR_NOLOCK)) { | 732 | if (!(flags & XFS_ATTR_NOLOCK)) { |
| 722 | lock_flags |= XFS_IOLOCK_EXCL; | 733 | lock_flags |= XFS_IOLOCK_EXCL; |
| @@ -860,6 +871,12 @@ xfs_setattr_size( | |||
| 860 | xfs_inode_clear_eofblocks_tag(ip); | 871 | xfs_inode_clear_eofblocks_tag(ip); |
| 861 | } | 872 | } |
| 862 | 873 | ||
| 874 | /* | ||
| 875 | * Change file access modes. | ||
| 876 | */ | ||
| 877 | if (mask & ATTR_MODE) | ||
| 878 | xfs_setattr_mode(tp, ip, iattr); | ||
| 879 | |||
| 863 | if (mask & ATTR_CTIME) { | 880 | if (mask & ATTR_CTIME) { |
| 864 | inode->i_ctime = iattr->ia_ctime; | 881 | inode->i_ctime = iattr->ia_ctime; |
| 865 | ip->i_d.di_ctime.t_sec = iattr->ia_ctime.tv_sec; | 882 | ip->i_d.di_ctime.t_sec = iattr->ia_ctime.tv_sec; |
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 93f03ec17eec..d9e4d3c3991a 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c | |||
| @@ -2097,6 +2097,17 @@ xlog_recover_do_reg_buffer( | |||
| 2097 | ((uint)bit << XFS_BLF_SHIFT) + (nbits << XFS_BLF_SHIFT)); | 2097 | ((uint)bit << XFS_BLF_SHIFT) + (nbits << XFS_BLF_SHIFT)); |
| 2098 | 2098 | ||
| 2099 | /* | 2099 | /* |
| 2100 | * The dirty regions logged in the buffer, even though | ||
| 2101 | * contiguous, may span multiple chunks. This is because the | ||
| 2102 | * dirty region may span a physical page boundary in a buffer | ||
| 2103 | * and hence be split into two separate vectors for writing into | ||
| 2104 | * the log. Hence we need to trim nbits back to the length of | ||
| 2105 | * the current region being copied out of the log. | ||
| 2106 | */ | ||
| 2107 | if (item->ri_buf[i].i_len < (nbits << XFS_BLF_SHIFT)) | ||
| 2108 | nbits = item->ri_buf[i].i_len >> XFS_BLF_SHIFT; | ||
| 2109 | |||
| 2110 | /* | ||
| 2100 | * Do a sanity check if this is a dquot buffer. Just checking | 2111 | * Do a sanity check if this is a dquot buffer. Just checking |
| 2101 | * the first dquot in the buffer should do. XXXThis is | 2112 | * the first dquot in the buffer should do. XXXThis is |
| 2102 | * probably a good thing to do for other buf types also. | 2113 | * probably a good thing to do for other buf types also. |
diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c index c41190cad6e9..6cdf6ffc36a1 100644 --- a/fs/xfs/xfs_qm_syscalls.c +++ b/fs/xfs/xfs_qm_syscalls.c | |||
| @@ -489,31 +489,36 @@ xfs_qm_scall_setqlim( | |||
| 489 | if ((newlim->d_fieldmask & XFS_DQ_MASK) == 0) | 489 | if ((newlim->d_fieldmask & XFS_DQ_MASK) == 0) |
| 490 | return 0; | 490 | return 0; |
| 491 | 491 | ||
| 492 | tp = xfs_trans_alloc(mp, XFS_TRANS_QM_SETQLIM); | ||
| 493 | error = xfs_trans_reserve(tp, 0, XFS_QM_SETQLIM_LOG_RES(mp), | ||
| 494 | 0, 0, XFS_DEFAULT_LOG_COUNT); | ||
| 495 | if (error) { | ||
| 496 | xfs_trans_cancel(tp, 0); | ||
| 497 | return (error); | ||
| 498 | } | ||
| 499 | |||
| 500 | /* | 492 | /* |
| 501 | * We don't want to race with a quotaoff so take the quotaoff lock. | 493 | * We don't want to race with a quotaoff so take the quotaoff lock. |
| 502 | * (We don't hold an inode lock, so there's nothing else to stop | 494 | * We don't hold an inode lock, so there's nothing else to stop |
| 503 | * a quotaoff from happening). (XXXThis doesn't currently happen | 495 | * a quotaoff from happening. |
| 504 | * because we take the vfslock before calling xfs_qm_sysent). | ||
| 505 | */ | 496 | */ |
| 506 | mutex_lock(&q->qi_quotaofflock); | 497 | mutex_lock(&q->qi_quotaofflock); |
| 507 | 498 | ||
| 508 | /* | 499 | /* |
| 509 | * Get the dquot (locked), and join it to the transaction. | 500 | * Get the dquot (locked) before we start, as we need to do a |
| 510 | * Allocate the dquot if this doesn't exist. | 501 | * transaction to allocate it if it doesn't exist. Once we have the |
| 502 | * dquot, unlock it so we can start the next transaction safely. We hold | ||
| 503 | * a reference to the dquot, so it's safe to do this unlock/lock without | ||
| 504 | * it being reclaimed in the mean time. | ||
| 511 | */ | 505 | */ |
| 512 | if ((error = xfs_qm_dqget(mp, NULL, id, type, XFS_QMOPT_DQALLOC, &dqp))) { | 506 | error = xfs_qm_dqget(mp, NULL, id, type, XFS_QMOPT_DQALLOC, &dqp); |
| 513 | xfs_trans_cancel(tp, XFS_TRANS_ABORT); | 507 | if (error) { |
| 514 | ASSERT(error != ENOENT); | 508 | ASSERT(error != ENOENT); |
| 515 | goto out_unlock; | 509 | goto out_unlock; |
| 516 | } | 510 | } |
| 511 | xfs_dqunlock(dqp); | ||
| 512 | |||
| 513 | tp = xfs_trans_alloc(mp, XFS_TRANS_QM_SETQLIM); | ||
| 514 | error = xfs_trans_reserve(tp, 0, XFS_QM_SETQLIM_LOG_RES(mp), | ||
| 515 | 0, 0, XFS_DEFAULT_LOG_COUNT); | ||
| 516 | if (error) { | ||
| 517 | xfs_trans_cancel(tp, 0); | ||
| 518 | goto out_rele; | ||
| 519 | } | ||
| 520 | |||
| 521 | xfs_dqlock(dqp); | ||
| 517 | xfs_trans_dqjoin(tp, dqp); | 522 | xfs_trans_dqjoin(tp, dqp); |
| 518 | ddq = &dqp->q_core; | 523 | ddq = &dqp->q_core; |
| 519 | 524 | ||
| @@ -621,9 +626,10 @@ xfs_qm_scall_setqlim( | |||
| 621 | xfs_trans_log_dquot(tp, dqp); | 626 | xfs_trans_log_dquot(tp, dqp); |
| 622 | 627 | ||
| 623 | error = xfs_trans_commit(tp, 0); | 628 | error = xfs_trans_commit(tp, 0); |
| 624 | xfs_qm_dqrele(dqp); | ||
| 625 | 629 | ||
| 626 | out_unlock: | 630 | out_rele: |
| 631 | xfs_qm_dqrele(dqp); | ||
| 632 | out_unlock: | ||
| 627 | mutex_unlock(&q->qi_quotaofflock); | 633 | mutex_unlock(&q->qi_quotaofflock); |
| 628 | return error; | 634 | return error; |
| 629 | } | 635 | } |
diff --git a/fs/xfs/xfs_symlink.c b/fs/xfs/xfs_symlink.c index 5f234389327c..195a403e1522 100644 --- a/fs/xfs/xfs_symlink.c +++ b/fs/xfs/xfs_symlink.c | |||
| @@ -56,16 +56,9 @@ xfs_symlink_blocks( | |||
| 56 | struct xfs_mount *mp, | 56 | struct xfs_mount *mp, |
| 57 | int pathlen) | 57 | int pathlen) |
| 58 | { | 58 | { |
| 59 | int fsblocks = 0; | 59 | int buflen = XFS_SYMLINK_BUF_SPACE(mp, mp->m_sb.sb_blocksize); |
| 60 | int len = pathlen; | ||
| 61 | 60 | ||
| 62 | do { | 61 | return (pathlen + buflen - 1) / buflen; |
| 63 | fsblocks++; | ||
| 64 | len -= XFS_SYMLINK_BUF_SPACE(mp, mp->m_sb.sb_blocksize); | ||
| 65 | } while (len > 0); | ||
| 66 | |||
| 67 | ASSERT(fsblocks <= XFS_SYMLINK_MAPS); | ||
| 68 | return fsblocks; | ||
| 69 | } | 62 | } |
| 70 | 63 | ||
| 71 | static int | 64 | static int |
| @@ -405,7 +398,7 @@ xfs_symlink( | |||
| 405 | if (pathlen <= XFS_LITINO(mp, dp->i_d.di_version)) | 398 | if (pathlen <= XFS_LITINO(mp, dp->i_d.di_version)) |
| 406 | fs_blocks = 0; | 399 | fs_blocks = 0; |
| 407 | else | 400 | else |
| 408 | fs_blocks = XFS_B_TO_FSB(mp, pathlen); | 401 | fs_blocks = xfs_symlink_blocks(mp, pathlen); |
| 409 | resblks = XFS_SYMLINK_SPACE_RES(mp, link_name->len, fs_blocks); | 402 | resblks = XFS_SYMLINK_SPACE_RES(mp, link_name->len, fs_blocks); |
| 410 | error = xfs_trans_reserve(tp, resblks, XFS_SYMLINK_LOG_RES(mp), 0, | 403 | error = xfs_trans_reserve(tp, resblks, XFS_SYMLINK_LOG_RES(mp), 0, |
| 411 | XFS_TRANS_PERM_LOG_RES, XFS_SYMLINK_LOG_COUNT); | 404 | XFS_TRANS_PERM_LOG_RES, XFS_SYMLINK_LOG_COUNT); |
| @@ -512,7 +505,7 @@ xfs_symlink( | |||
| 512 | cur_chunk = target_path; | 505 | cur_chunk = target_path; |
| 513 | offset = 0; | 506 | offset = 0; |
| 514 | for (n = 0; n < nmaps; n++) { | 507 | for (n = 0; n < nmaps; n++) { |
| 515 | char *buf; | 508 | char *buf; |
| 516 | 509 | ||
| 517 | d = XFS_FSB_TO_DADDR(mp, mval[n].br_startblock); | 510 | d = XFS_FSB_TO_DADDR(mp, mval[n].br_startblock); |
| 518 | byte_cnt = XFS_FSB_TO_B(mp, mval[n].br_blockcount); | 511 | byte_cnt = XFS_FSB_TO_B(mp, mval[n].br_blockcount); |
| @@ -525,9 +518,7 @@ xfs_symlink( | |||
| 525 | bp->b_ops = &xfs_symlink_buf_ops; | 518 | bp->b_ops = &xfs_symlink_buf_ops; |
| 526 | 519 | ||
| 527 | byte_cnt = XFS_SYMLINK_BUF_SPACE(mp, byte_cnt); | 520 | byte_cnt = XFS_SYMLINK_BUF_SPACE(mp, byte_cnt); |
| 528 | if (pathlen < byte_cnt) { | 521 | byte_cnt = min(byte_cnt, pathlen); |
| 529 | byte_cnt = pathlen; | ||
| 530 | } | ||
| 531 | 522 | ||
| 532 | buf = bp->b_addr; | 523 | buf = bp->b_addr; |
| 533 | buf += xfs_symlink_hdr_set(mp, ip->i_ino, offset, | 524 | buf += xfs_symlink_hdr_set(mp, ip->i_ino, offset, |
| @@ -542,6 +533,7 @@ xfs_symlink( | |||
| 542 | xfs_trans_log_buf(tp, bp, 0, (buf + byte_cnt - 1) - | 533 | xfs_trans_log_buf(tp, bp, 0, (buf + byte_cnt - 1) - |
| 543 | (char *)bp->b_addr); | 534 | (char *)bp->b_addr); |
| 544 | } | 535 | } |
| 536 | ASSERT(pathlen == 0); | ||
| 545 | } | 537 | } |
| 546 | 538 | ||
| 547 | /* | 539 | /* |
diff --git a/include/linux/aer.h b/include/linux/aer.h index ec10e1b24c1c..737f90ab4b62 100644 --- a/include/linux/aer.h +++ b/include/linux/aer.h | |||
| @@ -49,10 +49,11 @@ static inline int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev) | |||
| 49 | } | 49 | } |
| 50 | #endif | 50 | #endif |
| 51 | 51 | ||
| 52 | extern void cper_print_aer(const char *prefix, struct pci_dev *dev, | 52 | extern void cper_print_aer(struct pci_dev *dev, |
| 53 | int cper_severity, struct aer_capability_regs *aer); | 53 | int cper_severity, struct aer_capability_regs *aer); |
| 54 | extern int cper_severity_to_aer(int cper_severity); | 54 | extern int cper_severity_to_aer(int cper_severity); |
| 55 | extern void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn, | 55 | extern void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn, |
| 56 | int severity); | 56 | int severity, |
| 57 | struct aer_capability_regs *aer_regs); | ||
| 57 | #endif //_AER_H_ | 58 | #endif //_AER_H_ |
| 58 | 59 | ||
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h index e773dfa5f98f..4ea4f985f394 100644 --- a/include/target/target_core_base.h +++ b/include/target/target_core_base.h | |||
| @@ -543,6 +543,7 @@ struct se_session { | |||
| 543 | struct list_head sess_list; | 543 | struct list_head sess_list; |
| 544 | struct list_head sess_acl_list; | 544 | struct list_head sess_acl_list; |
| 545 | struct list_head sess_cmd_list; | 545 | struct list_head sess_cmd_list; |
| 546 | struct list_head sess_wait_list; | ||
| 546 | spinlock_t sess_cmd_lock; | 547 | spinlock_t sess_cmd_lock; |
| 547 | struct kref sess_kref; | 548 | struct kref sess_kref; |
| 548 | }; | 549 | }; |
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h index ba3471b73c07..1dcce9cc99b9 100644 --- a/include/target/target_core_fabric.h +++ b/include/target/target_core_fabric.h | |||
| @@ -114,7 +114,7 @@ sense_reason_t transport_generic_new_cmd(struct se_cmd *); | |||
| 114 | 114 | ||
| 115 | void target_execute_cmd(struct se_cmd *cmd); | 115 | void target_execute_cmd(struct se_cmd *cmd); |
| 116 | 116 | ||
| 117 | void transport_generic_free_cmd(struct se_cmd *, int); | 117 | int transport_generic_free_cmd(struct se_cmd *, int); |
| 118 | 118 | ||
| 119 | bool transport_wait_for_tasks(struct se_cmd *); | 119 | bool transport_wait_for_tasks(struct se_cmd *); |
| 120 | int transport_check_aborted_status(struct se_cmd *, int); | 120 | int transport_check_aborted_status(struct se_cmd *, int); |
| @@ -123,7 +123,7 @@ int transport_send_check_condition_and_sense(struct se_cmd *, | |||
| 123 | int target_get_sess_cmd(struct se_session *, struct se_cmd *, bool); | 123 | int target_get_sess_cmd(struct se_session *, struct se_cmd *, bool); |
| 124 | int target_put_sess_cmd(struct se_session *, struct se_cmd *); | 124 | int target_put_sess_cmd(struct se_session *, struct se_cmd *); |
| 125 | void target_sess_cmd_list_set_waiting(struct se_session *); | 125 | void target_sess_cmd_list_set_waiting(struct se_session *); |
| 126 | void target_wait_for_sess_cmds(struct se_session *, int); | 126 | void target_wait_for_sess_cmds(struct se_session *); |
| 127 | 127 | ||
| 128 | int core_alua_check_nonop_delay(struct se_cmd *); | 128 | int core_alua_check_nonop_delay(struct se_cmd *); |
| 129 | 129 | ||
diff --git a/include/video/omapdss.h b/include/video/omapdss.h index 62ca9a77c1d6..aeb4e9a0c5d1 100644 --- a/include/video/omapdss.h +++ b/include/video/omapdss.h | |||
| @@ -748,6 +748,7 @@ struct omap_dss_driver { | |||
| 748 | }; | 748 | }; |
| 749 | 749 | ||
| 750 | enum omapdss_version omapdss_get_version(void); | 750 | enum omapdss_version omapdss_get_version(void); |
| 751 | bool omapdss_is_initialized(void); | ||
| 751 | 752 | ||
| 752 | int omap_dss_register_driver(struct omap_dss_driver *); | 753 | int omap_dss_register_driver(struct omap_dss_driver *); |
| 753 | void omap_dss_unregister_driver(struct omap_dss_driver *); | 754 | void omap_dss_unregister_driver(struct omap_dss_driver *); |
diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h index 0a7515c1e3a4..569c07f2e344 100644 --- a/include/xen/xenbus.h +++ b/include/xen/xenbus.h | |||
| @@ -70,6 +70,7 @@ struct xenbus_device { | |||
| 70 | struct device dev; | 70 | struct device dev; |
| 71 | enum xenbus_state state; | 71 | enum xenbus_state state; |
| 72 | struct completion down; | 72 | struct completion down; |
| 73 | struct work_struct work; | ||
| 73 | }; | 74 | }; |
| 74 | 75 | ||
| 75 | static inline struct xenbus_device *to_xenbus_device(struct device *dev) | 76 | static inline struct xenbus_device *to_xenbus_device(struct device *dev) |
diff --git a/kernel/range.c b/kernel/range.c index 071b0ab455cb..eb911dbce267 100644 --- a/kernel/range.c +++ b/kernel/range.c | |||
| @@ -48,9 +48,11 @@ int add_range_with_merge(struct range *range, int az, int nr_range, | |||
| 48 | final_start = min(range[i].start, start); | 48 | final_start = min(range[i].start, start); |
| 49 | final_end = max(range[i].end, end); | 49 | final_end = max(range[i].end, end); |
| 50 | 50 | ||
| 51 | range[i].start = final_start; | 51 | /* clear it and add it back for further merge */ |
| 52 | range[i].end = final_end; | 52 | range[i].start = 0; |
| 53 | return nr_range; | 53 | range[i].end = 0; |
| 54 | return add_range_with_merge(range, az, nr_range, | ||
| 55 | final_start, final_end); | ||
| 54 | } | 56 | } |
| 55 | 57 | ||
| 56 | /* Need to add it: */ | 58 | /* Need to add it: */ |
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index b59aea2c48c2..e444ff88f0a4 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
| @@ -620,6 +620,9 @@ int ring_buffer_poll_wait(struct ring_buffer *buffer, int cpu, | |||
| 620 | if (cpu == RING_BUFFER_ALL_CPUS) | 620 | if (cpu == RING_BUFFER_ALL_CPUS) |
| 621 | work = &buffer->irq_work; | 621 | work = &buffer->irq_work; |
| 622 | else { | 622 | else { |
| 623 | if (!cpumask_test_cpu(cpu, buffer->cpumask)) | ||
| 624 | return -EINVAL; | ||
| 625 | |||
| 623 | cpu_buffer = buffer->buffers[cpu]; | 626 | cpu_buffer = buffer->buffers[cpu]; |
| 624 | work = &cpu_buffer->irq_work; | 627 | work = &cpu_buffer->irq_work; |
| 625 | } | 628 | } |
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index ae6fa2d1cdf7..4d79485b3237 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
| @@ -6216,10 +6216,15 @@ __init static int tracer_alloc_buffers(void) | |||
| 6216 | 6216 | ||
| 6217 | trace_init_cmdlines(); | 6217 | trace_init_cmdlines(); |
| 6218 | 6218 | ||
| 6219 | register_tracer(&nop_trace); | 6219 | /* |
| 6220 | 6220 | * register_tracer() might reference current_trace, so it | |
| 6221 | * needs to be set before we register anything. This is | ||
| 6222 | * just a bootstrap of current_trace anyway. | ||
| 6223 | */ | ||
| 6221 | global_trace.current_trace = &nop_trace; | 6224 | global_trace.current_trace = &nop_trace; |
| 6222 | 6225 | ||
| 6226 | register_tracer(&nop_trace); | ||
| 6227 | |||
| 6223 | /* All seems OK, enable tracing */ | 6228 | /* All seems OK, enable tracing */ |
| 6224 | tracing_disabled = 0; | 6229 | tracing_disabled = 0; |
| 6225 | 6230 | ||
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index 871c73c92165..29b4ba93ab3c 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c | |||
| @@ -1287,7 +1287,7 @@ static bool use_gss_proxy(struct net *net) | |||
| 1287 | 1287 | ||
| 1288 | #ifdef CONFIG_PROC_FS | 1288 | #ifdef CONFIG_PROC_FS |
| 1289 | 1289 | ||
| 1290 | static bool set_gss_proxy(struct net *net, int type) | 1290 | static int set_gss_proxy(struct net *net, int type) |
| 1291 | { | 1291 | { |
| 1292 | struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); | 1292 | struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); |
| 1293 | int ret = 0; | 1293 | int ret = 0; |
| @@ -1317,10 +1317,12 @@ static inline bool gssp_ready(struct sunrpc_net *sn) | |||
| 1317 | return false; | 1317 | return false; |
| 1318 | } | 1318 | } |
| 1319 | 1319 | ||
| 1320 | static int wait_for_gss_proxy(struct net *net) | 1320 | static int wait_for_gss_proxy(struct net *net, struct file *file) |
| 1321 | { | 1321 | { |
| 1322 | struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); | 1322 | struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); |
| 1323 | 1323 | ||
| 1324 | if (file->f_flags & O_NONBLOCK && !gssp_ready(sn)) | ||
| 1325 | return -EAGAIN; | ||
| 1324 | return wait_event_interruptible(sn->gssp_wq, gssp_ready(sn)); | 1326 | return wait_event_interruptible(sn->gssp_wq, gssp_ready(sn)); |
| 1325 | } | 1327 | } |
| 1326 | 1328 | ||
| @@ -1362,7 +1364,7 @@ static ssize_t read_gssp(struct file *file, char __user *buf, | |||
| 1362 | size_t len; | 1364 | size_t len; |
| 1363 | int ret; | 1365 | int ret; |
| 1364 | 1366 | ||
| 1365 | ret = wait_for_gss_proxy(net); | 1367 | ret = wait_for_gss_proxy(net, file); |
| 1366 | if (ret) | 1368 | if (ret) |
| 1367 | return ret; | 1369 | return ret; |
| 1368 | 1370 | ||
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c index c3f9e1ef7f53..06bdf5a1082c 100644 --- a/net/sunrpc/svcauth_unix.c +++ b/net/sunrpc/svcauth_unix.c | |||
| @@ -810,11 +810,15 @@ svcauth_unix_accept(struct svc_rqst *rqstp, __be32 *authp) | |||
| 810 | goto badcred; | 810 | goto badcred; |
| 811 | argv->iov_base = (void*)((__be32*)argv->iov_base + slen); /* skip machname */ | 811 | argv->iov_base = (void*)((__be32*)argv->iov_base + slen); /* skip machname */ |
| 812 | argv->iov_len -= slen*4; | 812 | argv->iov_len -= slen*4; |
| 813 | 813 | /* | |
| 814 | * Note: we skip uid_valid()/gid_valid() checks here for | ||
| 815 | * backwards compatibility with clients that use -1 id's. | ||
| 816 | * Instead, -1 uid or gid is later mapped to the | ||
| 817 | * (export-specific) anonymous id by nfsd_setuser. | ||
| 818 | * Supplementary gid's will be left alone. | ||
| 819 | */ | ||
| 814 | cred->cr_uid = make_kuid(&init_user_ns, svc_getnl(argv)); /* uid */ | 820 | cred->cr_uid = make_kuid(&init_user_ns, svc_getnl(argv)); /* uid */ |
| 815 | cred->cr_gid = make_kgid(&init_user_ns, svc_getnl(argv)); /* gid */ | 821 | cred->cr_gid = make_kgid(&init_user_ns, svc_getnl(argv)); /* gid */ |
| 816 | if (!uid_valid(cred->cr_uid) || !gid_valid(cred->cr_gid)) | ||
| 817 | goto badcred; | ||
| 818 | slen = svc_getnl(argv); /* gids length */ | 822 | slen = svc_getnl(argv); /* gids length */ |
| 819 | if (slen > 16 || (len -= (slen + 2)*4) < 0) | 823 | if (slen > 16 || (len -= (slen + 2)*4) < 0) |
| 820 | goto badcred; | 824 | goto badcred; |
| @@ -823,8 +827,6 @@ svcauth_unix_accept(struct svc_rqst *rqstp, __be32 *authp) | |||
| 823 | return SVC_CLOSE; | 827 | return SVC_CLOSE; |
| 824 | for (i = 0; i < slen; i++) { | 828 | for (i = 0; i < slen; i++) { |
| 825 | kgid_t kgid = make_kgid(&init_user_ns, svc_getnl(argv)); | 829 | kgid_t kgid = make_kgid(&init_user_ns, svc_getnl(argv)); |
| 826 | if (!gid_valid(kgid)) | ||
| 827 | goto badcred; | ||
| 828 | GROUP_AT(cred->cr_group_info, i) = kgid; | 830 | GROUP_AT(cred->cr_group_info, i) = kgid; |
| 829 | } | 831 | } |
| 830 | if (svc_getu32(argv) != htonl(RPC_AUTH_NULL) || svc_getu32(argv) != 0) { | 832 | if (svc_getu32(argv) != htonl(RPC_AUTH_NULL) || svc_getu32(argv) != 0) { |
diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c index 0f6f481cec09..030f53c96ec0 100644 --- a/sound/soc/codecs/cs42l52.c +++ b/sound/soc/codecs/cs42l52.c | |||
| @@ -86,7 +86,7 @@ static const struct reg_default cs42l52_reg_defaults[] = { | |||
| 86 | { CS42L52_BEEP_VOL, 0x00 }, /* r1D Beep Volume off Time */ | 86 | { CS42L52_BEEP_VOL, 0x00 }, /* r1D Beep Volume off Time */ |
| 87 | { CS42L52_BEEP_TONE_CTL, 0x00 }, /* r1E Beep Tone Cfg. */ | 87 | { CS42L52_BEEP_TONE_CTL, 0x00 }, /* r1E Beep Tone Cfg. */ |
| 88 | { CS42L52_TONE_CTL, 0x00 }, /* r1F Tone Ctl */ | 88 | { CS42L52_TONE_CTL, 0x00 }, /* r1F Tone Ctl */ |
| 89 | { CS42L52_MASTERA_VOL, 0x88 }, /* r20 Master A Volume */ | 89 | { CS42L52_MASTERA_VOL, 0x00 }, /* r20 Master A Volume */ |
| 90 | { CS42L52_MASTERB_VOL, 0x00 }, /* r21 Master B Volume */ | 90 | { CS42L52_MASTERB_VOL, 0x00 }, /* r21 Master B Volume */ |
| 91 | { CS42L52_HPA_VOL, 0x00 }, /* r22 Headphone A Volume */ | 91 | { CS42L52_HPA_VOL, 0x00 }, /* r22 Headphone A Volume */ |
| 92 | { CS42L52_HPB_VOL, 0x00 }, /* r23 Headphone B Volume */ | 92 | { CS42L52_HPB_VOL, 0x00 }, /* r23 Headphone B Volume */ |
| @@ -225,7 +225,7 @@ static const char * const mic_bias_level_text[] = { | |||
| 225 | }; | 225 | }; |
| 226 | 226 | ||
| 227 | static const struct soc_enum mic_bias_level_enum = | 227 | static const struct soc_enum mic_bias_level_enum = |
| 228 | SOC_ENUM_SINGLE(CS42L52_IFACE_CTL1, 0, | 228 | SOC_ENUM_SINGLE(CS42L52_IFACE_CTL2, 0, |
| 229 | ARRAY_SIZE(mic_bias_level_text), mic_bias_level_text); | 229 | ARRAY_SIZE(mic_bias_level_text), mic_bias_level_text); |
| 230 | 230 | ||
| 231 | static const char * const cs42l52_mic_text[] = { "Single", "Differential" }; | 231 | static const char * const cs42l52_mic_text[] = { "Single", "Differential" }; |
| @@ -413,7 +413,7 @@ static const struct snd_kcontrol_new cs42l52_snd_controls[] = { | |||
| 413 | SOC_ENUM("Headphone Analog Gain", hp_gain_enum), | 413 | SOC_ENUM("Headphone Analog Gain", hp_gain_enum), |
| 414 | 414 | ||
| 415 | SOC_DOUBLE_R_SX_TLV("Speaker Volume", CS42L52_SPKA_VOL, | 415 | SOC_DOUBLE_R_SX_TLV("Speaker Volume", CS42L52_SPKA_VOL, |
| 416 | CS42L52_SPKB_VOL, 7, 0x1, 0xff, hl_tlv), | 416 | CS42L52_SPKB_VOL, 0, 0x1, 0xff, hl_tlv), |
| 417 | 417 | ||
| 418 | SOC_DOUBLE_R_SX_TLV("Bypass Volume", CS42L52_PASSTHRUA_VOL, | 418 | SOC_DOUBLE_R_SX_TLV("Bypass Volume", CS42L52_PASSTHRUA_VOL, |
| 419 | CS42L52_PASSTHRUB_VOL, 6, 0x18, 0x90, pga_tlv), | 419 | CS42L52_PASSTHRUB_VOL, 6, 0x18, 0x90, pga_tlv), |
| @@ -441,7 +441,7 @@ static const struct snd_kcontrol_new cs42l52_snd_controls[] = { | |||
| 441 | 441 | ||
| 442 | SOC_DOUBLE_R_SX_TLV("PCM Mixer Volume", | 442 | SOC_DOUBLE_R_SX_TLV("PCM Mixer Volume", |
| 443 | CS42L52_PCMA_MIXER_VOL, CS42L52_PCMB_MIXER_VOL, | 443 | CS42L52_PCMA_MIXER_VOL, CS42L52_PCMB_MIXER_VOL, |
| 444 | 6, 0x7f, 0x19, hl_tlv), | 444 | 0, 0x7f, 0x19, hl_tlv), |
| 445 | SOC_DOUBLE_R("PCM Mixer Switch", | 445 | SOC_DOUBLE_R("PCM Mixer Switch", |
| 446 | CS42L52_PCMA_MIXER_VOL, CS42L52_PCMB_MIXER_VOL, 7, 1, 1), | 446 | CS42L52_PCMA_MIXER_VOL, CS42L52_PCMB_MIXER_VOL, 7, 1, 1), |
| 447 | 447 | ||
diff --git a/sound/soc/codecs/cs42l52.h b/sound/soc/codecs/cs42l52.h index 60985c059071..4277012c4719 100644 --- a/sound/soc/codecs/cs42l52.h +++ b/sound/soc/codecs/cs42l52.h | |||
| @@ -157,7 +157,7 @@ | |||
| 157 | #define CS42L52_PB_CTL1_INV_PCMA (1 << 2) | 157 | #define CS42L52_PB_CTL1_INV_PCMA (1 << 2) |
| 158 | #define CS42L52_PB_CTL1_MSTB_MUTE (1 << 1) | 158 | #define CS42L52_PB_CTL1_MSTB_MUTE (1 << 1) |
| 159 | #define CS42L52_PB_CTL1_MSTA_MUTE (1 << 0) | 159 | #define CS42L52_PB_CTL1_MSTA_MUTE (1 << 0) |
| 160 | #define CS42L52_PB_CTL1_MUTE_MASK 0xFFFD | 160 | #define CS42L52_PB_CTL1_MUTE_MASK 0x03 |
| 161 | #define CS42L52_PB_CTL1_MUTE 3 | 161 | #define CS42L52_PB_CTL1_MUTE 3 |
| 162 | #define CS42L52_PB_CTL1_UNMUTE 0 | 162 | #define CS42L52_PB_CTL1_UNMUTE 0 |
| 163 | 163 | ||
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index ce0d36412c97..8d14a76c7249 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c | |||
| @@ -2233,7 +2233,7 @@ static int max98090_probe(struct snd_soc_codec *codec) | |||
| 2233 | dev_dbg(codec->dev, "irq = %d\n", max98090->irq); | 2233 | dev_dbg(codec->dev, "irq = %d\n", max98090->irq); |
| 2234 | 2234 | ||
| 2235 | ret = request_threaded_irq(max98090->irq, NULL, | 2235 | ret = request_threaded_irq(max98090->irq, NULL, |
| 2236 | max98090_interrupt, IRQF_TRIGGER_FALLING, | 2236 | max98090_interrupt, IRQF_TRIGGER_FALLING | IRQF_ONESHOT, |
| 2237 | "max98090_interrupt", codec); | 2237 | "max98090_interrupt", codec); |
| 2238 | if (ret < 0) { | 2238 | if (ret < 0) { |
| 2239 | dev_err(codec->dev, "request_irq failed: %d\n", | 2239 | dev_err(codec->dev, "request_irq failed: %d\n", |
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index 731884e04776..ba38f0679662 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c | |||
| @@ -190,7 +190,7 @@ ARIZONA_MIXER_CONTROLS("DSP2R", ARIZONA_DSP2RMIX_INPUT_1_SOURCE), | |||
| 190 | ARIZONA_MIXER_CONTROLS("DSP3L", ARIZONA_DSP3LMIX_INPUT_1_SOURCE), | 190 | ARIZONA_MIXER_CONTROLS("DSP3L", ARIZONA_DSP3LMIX_INPUT_1_SOURCE), |
| 191 | ARIZONA_MIXER_CONTROLS("DSP3R", ARIZONA_DSP3RMIX_INPUT_1_SOURCE), | 191 | ARIZONA_MIXER_CONTROLS("DSP3R", ARIZONA_DSP3RMIX_INPUT_1_SOURCE), |
| 192 | ARIZONA_MIXER_CONTROLS("DSP4L", ARIZONA_DSP4LMIX_INPUT_1_SOURCE), | 192 | ARIZONA_MIXER_CONTROLS("DSP4L", ARIZONA_DSP4LMIX_INPUT_1_SOURCE), |
| 193 | ARIZONA_MIXER_CONTROLS("DSP5R", ARIZONA_DSP4RMIX_INPUT_1_SOURCE), | 193 | ARIZONA_MIXER_CONTROLS("DSP4R", ARIZONA_DSP4RMIX_INPUT_1_SOURCE), |
| 194 | 194 | ||
| 195 | ARIZONA_MIXER_CONTROLS("Mic", ARIZONA_MICMIX_INPUT_1_SOURCE), | 195 | ARIZONA_MIXER_CONTROLS("Mic", ARIZONA_MICMIX_INPUT_1_SOURCE), |
| 196 | ARIZONA_MIXER_CONTROLS("Noise", ARIZONA_NOISEMIX_INPUT_1_SOURCE), | 196 | ARIZONA_MIXER_CONTROLS("Noise", ARIZONA_NOISEMIX_INPUT_1_SOURCE), |
| @@ -976,6 +976,8 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec) | |||
| 976 | if (ret != 0) | 976 | if (ret != 0) |
| 977 | return ret; | 977 | return ret; |
| 978 | 978 | ||
| 979 | arizona_init_spk(codec); | ||
| 980 | |||
| 979 | snd_soc_dapm_disable_pin(&codec->dapm, "HAPTICS"); | 981 | snd_soc_dapm_disable_pin(&codec->dapm, "HAPTICS"); |
| 980 | 982 | ||
| 981 | priv->core.arizona->dapm = &codec->dapm; | 983 | priv->core.arizona->dapm = &codec->dapm; |
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 1eb152cb1097..dfd997aaadfc 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c | |||
| @@ -383,6 +383,8 @@ static int wm8994_get_drc_enum(struct snd_kcontrol *kcontrol, | |||
| 383 | struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); | 383 | struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); |
| 384 | int drc = wm8994_get_drc(kcontrol->id.name); | 384 | int drc = wm8994_get_drc(kcontrol->id.name); |
| 385 | 385 | ||
| 386 | if (drc < 0) | ||
| 387 | return drc; | ||
| 386 | ucontrol->value.enumerated.item[0] = wm8994->drc_cfg[drc]; | 388 | ucontrol->value.enumerated.item[0] = wm8994->drc_cfg[drc]; |
| 387 | 389 | ||
| 388 | return 0; | 390 | return 0; |
| @@ -488,6 +490,9 @@ static int wm8994_get_retune_mobile_enum(struct snd_kcontrol *kcontrol, | |||
| 488 | struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); | 490 | struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); |
| 489 | int block = wm8994_get_retune_mobile_block(kcontrol->id.name); | 491 | int block = wm8994_get_retune_mobile_block(kcontrol->id.name); |
| 490 | 492 | ||
| 493 | if (block < 0) | ||
| 494 | return block; | ||
| 495 | |||
| 491 | ucontrol->value.enumerated.item[0] = wm8994->retune_mobile_cfg[block]; | 496 | ucontrol->value.enumerated.item[0] = wm8994->retune_mobile_cfg[block]; |
| 492 | 497 | ||
| 493 | return 0; | 498 | return 0; |
| @@ -1031,7 +1036,7 @@ static int aif1clk_ev(struct snd_soc_dapm_widget *w, | |||
| 1031 | { | 1036 | { |
| 1032 | struct snd_soc_codec *codec = w->codec; | 1037 | struct snd_soc_codec *codec = w->codec; |
| 1033 | struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); | 1038 | struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); |
| 1034 | struct wm8994 *control = codec->control_data; | 1039 | struct wm8994 *control = wm8994->wm8994; |
| 1035 | int mask = WM8994_AIF1DAC1L_ENA | WM8994_AIF1DAC1R_ENA; | 1040 | int mask = WM8994_AIF1DAC1L_ENA | WM8994_AIF1DAC1R_ENA; |
| 1036 | int i; | 1041 | int i; |
| 1037 | int dac; | 1042 | int dac; |
| @@ -3833,6 +3838,11 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data) | |||
| 3833 | dev_dbg(codec->dev, "Ignoring removed jack\n"); | 3838 | dev_dbg(codec->dev, "Ignoring removed jack\n"); |
| 3834 | return IRQ_HANDLED; | 3839 | return IRQ_HANDLED; |
| 3835 | } | 3840 | } |
| 3841 | } else if (!(reg & WM8958_MICD_STS)) { | ||
| 3842 | snd_soc_jack_report(wm8994->micdet[0].jack, 0, | ||
| 3843 | SND_JACK_MECHANICAL | SND_JACK_HEADSET | | ||
| 3844 | wm8994->btn_mask); | ||
| 3845 | goto out; | ||
| 3836 | } | 3846 | } |
| 3837 | 3847 | ||
| 3838 | if (wm8994->mic_detecting) | 3848 | if (wm8994->mic_detecting) |
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 56ecfc72f2e9..81490febac6d 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c | |||
| @@ -631,7 +631,8 @@ static int davinci_config_channel_size(struct davinci_audio_dev *dev, | |||
| 631 | int word_length) | 631 | int word_length) |
| 632 | { | 632 | { |
| 633 | u32 fmt; | 633 | u32 fmt; |
| 634 | u32 rotate = (word_length / 4) & 0x7; | 634 | u32 tx_rotate = (word_length / 4) & 0x7; |
| 635 | u32 rx_rotate = (32 - word_length) / 4; | ||
| 635 | u32 mask = (1ULL << word_length) - 1; | 636 | u32 mask = (1ULL << word_length) - 1; |
| 636 | 637 | ||
| 637 | /* | 638 | /* |
| @@ -655,9 +656,9 @@ static int davinci_config_channel_size(struct davinci_audio_dev *dev, | |||
| 655 | mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, | 656 | mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, |
| 656 | TXSSZ(fmt), TXSSZ(0x0F)); | 657 | TXSSZ(fmt), TXSSZ(0x0F)); |
| 657 | mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, | 658 | mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, |
| 658 | TXROT(rotate), TXROT(7)); | 659 | TXROT(tx_rotate), TXROT(7)); |
| 659 | mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, | 660 | mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, |
| 660 | RXROT(rotate), RXROT(7)); | 661 | RXROT(rx_rotate), RXROT(7)); |
| 661 | mcasp_set_reg(dev->base + DAVINCI_MCASP_RXMASK_REG, | 662 | mcasp_set_reg(dev->base + DAVINCI_MCASP_RXMASK_REG, |
| 662 | mask); | 663 | mask); |
| 663 | } | 664 | } |
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 3853f7eb3f28..06a8000aa07b 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c | |||
| @@ -220,8 +220,12 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream, | |||
| 220 | goto err; | 220 | goto err; |
| 221 | } | 221 | } |
| 222 | 222 | ||
| 223 | snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK, | 223 | if (cstream->direction == SND_COMPRESS_PLAYBACK) |
| 224 | SND_SOC_DAPM_STREAM_START); | 224 | snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK, |
| 225 | SND_SOC_DAPM_STREAM_START); | ||
| 226 | else | ||
| 227 | snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_CAPTURE, | ||
| 228 | SND_SOC_DAPM_STREAM_START); | ||
| 225 | 229 | ||
| 226 | /* cancel any delayed stream shutdown that is pending */ | 230 | /* cancel any delayed stream shutdown that is pending */ |
| 227 | rtd->pop_wait = 0; | 231 | rtd->pop_wait = 0; |
diff --git a/sound/usb/6fire/firmware.c b/sound/usb/6fire/firmware.c index a1d9b0792a1e..b9defcdeb7ef 100644 --- a/sound/usb/6fire/firmware.c +++ b/sound/usb/6fire/firmware.c | |||
| @@ -42,8 +42,8 @@ static const u8 ep_w_max_packet_size[] = { | |||
| 42 | 0x94, 0x01, 0x5c, 0x02 /* alt 3: 404 EP2 and 604 EP6 (25 fpp) */ | 42 | 0x94, 0x01, 0x5c, 0x02 /* alt 3: 404 EP2 and 604 EP6 (25 fpp) */ |
| 43 | }; | 43 | }; |
| 44 | 44 | ||
| 45 | static const u8 known_fw_versions[][4] = { | 45 | static const u8 known_fw_versions[][2] = { |
| 46 | { 0x03, 0x01, 0x0b, 0x00 } | 46 | { 0x03, 0x01 } |
| 47 | }; | 47 | }; |
| 48 | 48 | ||
| 49 | struct ihex_record { | 49 | struct ihex_record { |
| @@ -343,7 +343,7 @@ static int usb6fire_fw_check(u8 *version) | |||
| 343 | int i; | 343 | int i; |
| 344 | 344 | ||
| 345 | for (i = 0; i < ARRAY_SIZE(known_fw_versions); i++) | 345 | for (i = 0; i < ARRAY_SIZE(known_fw_versions); i++) |
| 346 | if (!memcmp(version, known_fw_versions + i, 4)) | 346 | if (!memcmp(version, known_fw_versions + i, 2)) |
| 347 | return 0; | 347 | return 0; |
| 348 | 348 | ||
| 349 | snd_printk(KERN_ERR PREFIX "invalid fimware version in device: %*ph. " | 349 | snd_printk(KERN_ERR PREFIX "invalid fimware version in device: %*ph. " |