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

Merge tag 'sirf-arm-soc-v3.10-fixes' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/fixes-non-critical

From Barry Song, SiRF fixes for v3.10 (that we're punting to 3.11):

- Replace include linux/module.h with linux/export.h
- fix a checkpatch issue
- use of_platform_populate instead of of_platform_bus_probe

* tag 'sirf-arm-soc-v3.10-fixes' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel:
arm: prima2: use of_platform_populate instead of of_platform_bus_probe
ARM: prima2: fix a checkpatch issue
ARM: prima2: Replace include linux/module.h with linux/export.h
+ Linux 3.10-rc4

Signed-off-by: Olof Johansson <olof@lixom.net>

+4008 -1674
+25 -2
Documentation/powerpc/transactional_memory.txt
··· 147 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 170 Failure cause codes used by kernel 152 171 ================================== ··· 174 155 kernel aborted a transaction: 175 156 176 157 TM_CAUSE_RESCHED Thread was rescheduled. 158 + TM_CAUSE_TLBI Software TLB invalide. 177 159 TM_CAUSE_FAC_UNAV FP/VEC/VSX unavailable trap. 178 160 TM_CAUSE_SYSCALL Currently unused; future syscalls that must abort 179 161 transactions for consistency will use this. 180 162 TM_CAUSE_SIGNAL Signal delivered. 181 163 TM_CAUSE_MISC Currently unused. 164 + TM_CAUSE_ALIGNMENT Alignment fault. 165 + TM_CAUSE_EMULATE Emulation that touched memory. 182 166 183 - These can be checked by the user program's abort handler as TEXASR[0:7]. 184 - 167 + These can be checked by the user program's abort handler as TEXASR[0:7]. If 168 + bit 7 is set, it indicates that the error is consider persistent. For example 169 + a TM_CAUSE_ALIGNMENT will be persistent while a TM_CAUSE_RESCHED will not.q 185 170 186 171 GDB 187 172 ===
+11 -2
MAINTAINERS
··· 3322 3322 F: drivers/net/wan/sdla.c 3323 3323 3324 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 3327 L: linux-fbdev@vger.kernel.org 3327 3328 W: http://linux-fbdev.sourceforge.net/ 3328 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 3331 S: Maintained 3331 3332 F: Documentation/fb/ 3332 3333 F: Documentation/devicetree/bindings/fb/ ··· 6088 6087 T: git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git 6089 6088 S: Maintained 6090 6089 F: arch/parisc/ 6090 + F: Documentation/parisc/ 6091 6091 F: drivers/parisc/ 6092 + F: drivers/char/agp/parisc-agp.c 6093 + F: drivers/input/serio/gscps2.c 6094 + F: drivers/parport/parport_gsc.* 6095 + F: drivers/tty/serial/8250/8250_gsc.c 6096 + F: drivers/video/sti* 6097 + F: drivers/video/console/sti* 6098 + F: drivers/video/logo/logo_parisc* 6092 6099 6093 6100 PC87360 HARDWARE MONITORING DRIVER 6094 6101 M: Jim Cromie <jim.cromie@gmail.com>
+1 -1
Makefile
··· 1 1 VERSION = 3 2 2 PATCHLEVEL = 10 3 3 SUBLEVEL = 0 4 - EXTRAVERSION = -rc3 4 + EXTRAVERSION = -rc4 5 5 NAME = Unicycling Gorilla 6 6 7 7 # *DOCUMENTATION*
+15
arch/arm/boot/dts/exynos5250.dtsi
··· 497 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 515 amba { 501 516 #address-cells = <1>; 502 517 #size-cells = <1>;
+46 -8
arch/arm/configs/exynos_defconfig
··· 1 - CONFIG_EXPERIMENTAL=y 1 + CONFIG_SYSVIPC=y 2 2 CONFIG_NO_HZ=y 3 3 CONFIG_HIGH_RES_TIMERS=y 4 4 CONFIG_BLK_DEV_INITRD=y ··· 7 7 CONFIG_MODULE_UNLOAD=y 8 8 # CONFIG_BLK_DEV_BSG is not set 9 9 CONFIG_PARTITION_ADVANCED=y 10 - CONFIG_EFI_PARTITION=y 11 10 CONFIG_ARCH_EXYNOS=y 12 - CONFIG_S3C_LOWLEVEL_UART_PORT=1 11 + CONFIG_S3C_LOWLEVEL_UART_PORT=3 13 12 CONFIG_S3C24XX_PWM=y 14 13 CONFIG_ARCH_EXYNOS5=y 15 14 CONFIG_MACH_EXYNOS4_DT=y 16 - CONFIG_MACH_EXYNOS5_DT=y 17 15 CONFIG_SMP=y 18 16 CONFIG_NR_CPUS=2 19 17 CONFIG_PREEMPT=y 20 18 CONFIG_AEABI=y 19 + CONFIG_HIGHMEM=y 20 + CONFIG_ZBOOT_ROM_TEXT=0x0 21 + CONFIG_ZBOOT_ROM_BSS=0x0 21 22 CONFIG_ARM_APPENDED_DTB=y 22 23 CONFIG_ARM_ATAG_DTB_COMPAT=y 23 24 CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M" ··· 31 30 CONFIG_INET=y 32 31 CONFIG_RFKILL_REGULATOR=y 33 32 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 33 + CONFIG_DEVTMPFS=y 34 + CONFIG_DEVTMPFS_MOUNT=y 34 35 CONFIG_PROC_DEVICETREE=y 35 36 CONFIG_BLK_DEV_LOOP=y 37 + CONFIG_BLK_DEV_CRYPTOLOOP=y 36 38 CONFIG_BLK_DEV_RAM=y 37 39 CONFIG_BLK_DEV_RAM_SIZE=8192 38 40 CONFIG_SCSI=y 39 41 CONFIG_BLK_DEV_SD=y 40 42 CONFIG_CHR_DEV_SG=y 43 + CONFIG_MD=y 44 + CONFIG_BLK_DEV_DM=y 45 + CONFIG_DM_CRYPT=m 41 46 CONFIG_NETDEVICES=y 42 47 CONFIG_SMSC911X=y 43 48 CONFIG_USB_USBNET=y 44 49 CONFIG_USB_NET_SMSC75XX=y 45 50 CONFIG_USB_NET_SMSC95XX=y 46 51 CONFIG_INPUT_EVDEV=y 47 - # CONFIG_INPUT_KEYBOARD is not set 48 - # CONFIG_INPUT_MOUSE is not set 52 + CONFIG_KEYBOARD_CROS_EC=y 53 + # CONFIG_MOUSE_PS2 is not set 54 + CONFIG_MOUSE_CYAPA=y 49 55 CONFIG_INPUT_TOUCHSCREEN=y 50 56 CONFIG_SERIAL_8250=y 51 57 CONFIG_SERIAL_SAMSUNG=y 52 58 CONFIG_SERIAL_SAMSUNG_CONSOLE=y 53 59 CONFIG_SERIAL_OF_PLATFORM=y 54 60 CONFIG_HW_RANDOM=y 61 + CONFIG_TCG_TPM=y 62 + CONFIG_TCG_TIS_I2C_INFINEON=y 55 63 CONFIG_I2C=y 64 + CONFIG_I2C_MUX=y 65 + CONFIG_I2C_ARB_GPIO_CHALLENGE=y 66 + CONFIG_I2C_S3C2410=y 67 + CONFIG_DEBUG_GPIO=y 56 68 # CONFIG_HWMON is not set 69 + CONFIG_MFD_CROS_EC=y 70 + CONFIG_MFD_CROS_EC_I2C=y 71 + CONFIG_MFD_MAX77686=y 72 + CONFIG_MFD_MAX8997=y 73 + CONFIG_MFD_SEC_CORE=y 57 74 CONFIG_MFD_TPS65090=y 58 75 CONFIG_REGULATOR=y 59 76 CONFIG_REGULATOR_FIXED_VOLTAGE=y 60 77 CONFIG_REGULATOR_GPIO=y 78 + CONFIG_REGULATOR_MAX8997=y 79 + CONFIG_REGULATOR_MAX77686=y 80 + CONFIG_REGULATOR_S5M8767=y 61 81 CONFIG_REGULATOR_TPS65090=y 62 82 CONFIG_FB=y 83 + CONFIG_FB_MODE_HELPERS=y 84 + CONFIG_FB_SIMPLE=y 63 85 CONFIG_EXYNOS_VIDEO=y 64 86 CONFIG_EXYNOS_MIPI_DSI=y 65 87 CONFIG_EXYNOS_DP=y ··· 91 67 CONFIG_FONT_7x14=y 92 68 CONFIG_LOGO=y 93 69 CONFIG_USB=y 70 + CONFIG_USB_EHCI_HCD=y 71 + CONFIG_USB_EHCI_S5P=y 72 + CONFIG_USB_STORAGE=y 73 + CONFIG_USB_DWC3=y 74 + CONFIG_USB_PHY=y 75 + CONFIG_SAMSUNG_USB2PHY=y 76 + CONFIG_SAMSUNG_USB3PHY=y 77 + CONFIG_MMC=y 78 + CONFIG_MMC_SDHCI=y 79 + CONFIG_MMC_SDHCI_S3C=y 80 + CONFIG_MMC_DW=y 81 + CONFIG_MMC_DW_IDMAC=y 82 + CONFIG_MMC_DW_EXYNOS=y 83 + CONFIG_COMMON_CLK_MAX77686=y 94 84 CONFIG_EXT2_FS=y 95 85 CONFIG_EXT3_FS=y 96 86 CONFIG_EXT4_FS=y ··· 117 79 CONFIG_NLS_CODEPAGE_437=y 118 80 CONFIG_NLS_ASCII=y 119 81 CONFIG_NLS_ISO8859_1=y 82 + CONFIG_PRINTK_TIME=y 120 83 CONFIG_MAGIC_SYSRQ=y 121 84 CONFIG_DEBUG_KERNEL=y 122 85 CONFIG_DETECT_HUNG_TASK=y ··· 126 87 CONFIG_DEBUG_MUTEXES=y 127 88 CONFIG_DEBUG_INFO=y 128 89 CONFIG_DEBUG_USER=y 129 - CONFIG_DEBUG_LL=y 130 - CONFIG_EARLY_PRINTK=y 90 + CONFIG_CRYPTO_SHA256=y 131 91 CONFIG_CRC_CCITT=y
+2 -1
arch/arm/mach-exynos/Kconfig
··· 250 250 config MACH_UNIVERSAL_C210 251 251 bool "Mobile UNIVERSAL_C210 Board" 252 252 select CLKSRC_MMIO 253 + select CLKSRC_SAMSUNG_PWM 253 254 select CPU_EXYNOS4210 254 255 select EXYNOS4_SETUP_FIMC 255 256 select EXYNOS4_SETUP_FIMD0 ··· 282 281 select S5P_DEV_TV 283 282 select S5P_GPIO_INT 284 283 select S5P_SETUP_MIPIPHY 285 - select SAMSUNG_HRT 286 284 help 287 285 Machine support for Samsung Mobile Universal S5PC210 Reference 288 286 Board. ··· 410 410 depends on ARCH_EXYNOS4 411 411 select ARM_AMBA 412 412 select CLKSRC_OF 413 + select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210 413 414 select CPU_EXYNOS4210 414 415 select KEYBOARD_SAMSUNG if INPUT_KEYBOARD 415 416 select PINCTRL
+37 -2
arch/arm/mach-exynos/common.c
··· 10 10 */ 11 11 12 12 #include <linux/kernel.h> 13 + #include <linux/bitops.h> 13 14 #include <linux/interrupt.h> 14 15 #include <linux/irq.h> 15 16 #include <linux/irqchip.h> 16 17 #include <linux/io.h> 17 18 #include <linux/device.h> 18 19 #include <linux/gpio.h> 20 + #include <clocksource/samsung_pwm.h> 19 21 #include <linux/sched.h> 20 22 #include <linux/serial_core.h> 21 23 #include <linux/of.h> ··· 304 302 }, 305 303 }; 306 304 305 + static struct samsung_pwm_variant exynos4_pwm_variant = { 306 + .bits = 32, 307 + .div_base = 0, 308 + .has_tint_cstat = true, 309 + .tclk_mask = 0, 310 + }; 311 + 307 312 void exynos4_restart(char mode, const char *cmd) 308 313 { 309 314 __raw_writel(0x1, S5P_SWRESET); ··· 326 317 val = 0x1; 327 318 addr = EXYNOS_SWRESET; 328 319 } else if (of_machine_is_compatible("samsung,exynos5440")) { 320 + u32 status; 329 321 np = of_find_compatible_node(NULL, NULL, "samsung,exynos5440-clock"); 322 + 323 + addr = of_iomap(np, 0) + 0xbc; 324 + status = __raw_readl(addr); 325 + 330 326 addr = of_iomap(np, 0) + 0xcc; 331 - val = (0xfff << 20) | (0x1 << 16); 327 + val = __raw_readl(addr); 328 + 329 + val = (val & 0xffff0000) | (status & 0xffff); 332 330 } else { 333 331 pr_err("%s: cannot support non-DT\n", __func__); 334 332 return; ··· 458 442 iotable_init(exynos5440_iodesc0, ARRAY_SIZE(exynos5440_iodesc0)); 459 443 } 460 444 445 + void __init exynos_set_timer_source(u8 channels) 446 + { 447 + exynos4_pwm_variant.output_mask = BIT(SAMSUNG_PWM_NUM) - 1; 448 + exynos4_pwm_variant.output_mask &= ~channels; 449 + } 450 + 461 451 void __init exynos_init_time(void) 462 452 { 453 + unsigned int timer_irqs[SAMSUNG_PWM_NUM] = { 454 + EXYNOS4_IRQ_TIMER0_VIC, EXYNOS4_IRQ_TIMER1_VIC, 455 + EXYNOS4_IRQ_TIMER2_VIC, EXYNOS4_IRQ_TIMER3_VIC, 456 + EXYNOS4_IRQ_TIMER4_VIC, 457 + }; 458 + 463 459 if (of_have_populated_dt()) { 464 460 #ifdef CONFIG_OF 465 461 of_clk_init(NULL); ··· 483 455 exynos4_clk_init(NULL, !soc_is_exynos4210(), S5P_VA_CMU, readl(S5P_VA_CHIPID + 8) & 1); 484 456 exynos4_clk_register_fixed_ext(xxti_f, xusbxti_f); 485 457 #endif 486 - mct_init(S5P_VA_SYSTIMER, EXYNOS4_IRQ_MCT_G0, EXYNOS4_IRQ_MCT_L0, EXYNOS4_IRQ_MCT_L1); 458 + #ifdef CONFIG_CLKSRC_SAMSUNG_PWM 459 + if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_0) 460 + samsung_pwm_clocksource_init(S3C_VA_TIMER, 461 + timer_irqs, &exynos4_pwm_variant); 462 + else 463 + #endif 464 + mct_init(S5P_VA_SYSTIMER, EXYNOS4_IRQ_MCT_G0, 465 + EXYNOS4_IRQ_MCT_L0, EXYNOS4_IRQ_MCT_L1); 487 466 } 488 467 } 489 468
+2
arch/arm/mach-exynos/common.h
··· 32 32 33 33 void exynos_firmware_init(void); 34 34 35 + void exynos_set_timer_source(u8 channels); 36 + 35 37 #ifdef CONFIG_PM_GENERIC_DOMAINS 36 38 int exynos_pm_late_initcall(void); 37 39 #else
+13 -1
arch/arm/mach-exynos/include/mach/pm-core.h
··· 18 18 #ifndef __ASM_ARCH_PM_CORE_H 19 19 #define __ASM_ARCH_PM_CORE_H __FILE__ 20 20 21 + #include <linux/of.h> 21 22 #include <mach/regs-pmu.h> 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 22 29 23 30 static inline void s3c_pm_debug_init_uart(void) 24 31 { ··· 34 27 35 28 static inline void s3c_pm_arch_prepare_irqs(void) 36 29 { 37 - __raw_writel(s3c_irqwake_eintmask, S5P_EINT_WAKEUP_MASK); 30 + u32 eintmask = s3c_irqwake_eintmask; 31 + 32 + if (of_have_populated_dt()) 33 + eintmask = exynos_get_eint_wake_mask(); 34 + 35 + __raw_writel(eintmask, S5P_EINT_WAKEUP_MASK); 38 36 __raw_writel(s3c_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK); 39 37 } 40 38
+2 -3
arch/arm/mach-exynos/mach-universal_c210.c
··· 41 41 #include <plat/mfc.h> 42 42 #include <plat/sdhci.h> 43 43 #include <plat/fimc-core.h> 44 - #include <plat/samsung-time.h> 45 44 #include <plat/camport.h> 46 45 47 46 #include <mach/map.h> ··· 1093 1094 { 1094 1095 exynos_init_io(NULL, 0); 1095 1096 s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs)); 1096 - samsung_set_timer_source(SAMSUNG_PWM2, SAMSUNG_PWM4); 1097 + exynos_set_timer_source(BIT(2) | BIT(4)); 1097 1098 xxti_f = 0; 1098 1099 xusbxti_f = 24000000; 1099 1100 } ··· 1153 1154 .map_io = universal_map_io, 1154 1155 .init_machine = universal_machine_init, 1155 1156 .init_late = exynos_init_late, 1156 - .init_time = samsung_timer_init, 1157 + .init_time = exynos_init_time, 1157 1158 .reserve = &universal_reserve, 1158 1159 .restart = exynos4_restart, 1159 1160 MACHINE_END
+2 -15
arch/arm/mach-prima2/common.c
··· 17 17 #include <linux/of_platform.h> 18 18 #include "common.h" 19 19 20 - static struct of_device_id sirfsoc_of_bus_ids[] __initdata = { 21 - { .compatible = "simple-bus", }, 22 - {}, 23 - }; 24 - 25 - void __init sirfsoc_mach_init(void) 26 - { 27 - of_platform_bus_probe(NULL, sirfsoc_of_bus_ids, NULL); 28 - } 29 - 30 20 void __init sirfsoc_init_late(void) 31 21 { 32 22 sirfsoc_pm_init(); ··· 47 57 .map_io = sirfsoc_map_io, 48 58 .init_irq = irqchip_init, 49 59 .init_time = sirfsoc_init_time, 50 - .init_machine = sirfsoc_mach_init, 51 60 .init_late = sirfsoc_init_late, 52 61 .dt_compat = atlas6_dt_match, 53 62 .restart = sirfsoc_restart, ··· 55 66 56 67 #ifdef CONFIG_ARCH_PRIMA2 57 68 static const char *prima2_dt_match[] __initdata = { 58 - "sirf,prima2", 59 - NULL 69 + "sirf,prima2", 70 + NULL 60 71 }; 61 72 62 73 DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)") ··· 66 77 .init_irq = irqchip_init, 67 78 .init_time = sirfsoc_init_time, 68 79 .dma_zone_size = SZ_256M, 69 - .init_machine = sirfsoc_mach_init, 70 80 .init_late = sirfsoc_init_late, 71 81 .dt_compat = prima2_dt_match, 72 82 .restart = sirfsoc_restart, ··· 84 96 .map_io = sirfsoc_map_io, 85 97 .init_irq = irqchip_init, 86 98 .init_time = sirfsoc_init_time, 87 - .init_machine = sirfsoc_mach_init, 88 99 .init_late = sirfsoc_init_late, 89 100 .dt_compat = marco_dt_match, 90 101 .restart = sirfsoc_restart,
+1 -1
arch/arm/mach-prima2/pm.c
··· 9 9 #include <linux/kernel.h> 10 10 #include <linux/suspend.h> 11 11 #include <linux/slab.h> 12 - #include <linux/module.h> 12 + #include <linux/export.h> 13 13 #include <linux/of.h> 14 14 #include <linux/of_address.h> 15 15 #include <linux/of_device.h>
+3 -3
arch/arm/plat-samsung/devs.c
··· 311 311 #ifdef CONFIG_S5P_DEV_FIMD0 312 312 static struct resource s5p_fimd0_resource[] = { 313 313 [0] = DEFINE_RES_MEM(S5P_PA_FIMD0, SZ_32K), 314 - [1] = DEFINE_RES_IRQ(IRQ_FIMD0_VSYNC), 315 - [2] = DEFINE_RES_IRQ(IRQ_FIMD0_FIFO), 316 - [3] = DEFINE_RES_IRQ(IRQ_FIMD0_SYSTEM), 314 + [1] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_VSYNC, "vsync"), 315 + [2] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_FIFO, "fifo"), 316 + [3] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_SYSTEM, "lcd_sys"), 317 317 }; 318 318 319 319 struct platform_device s5p_device_fimd0 = {
+1
arch/arm64/kernel/arm64ksyms.c
··· 34 34 EXPORT_SYMBOL(__strncpy_from_user); 35 35 36 36 EXPORT_SYMBOL(copy_page); 37 + EXPORT_SYMBOL(clear_page); 37 38 38 39 EXPORT_SYMBOL(__copy_from_user); 39 40 EXPORT_SYMBOL(__copy_to_user);
+10
arch/arm64/kernel/entry.S
··· 390 390 b.eq el0_fpsimd_exc 391 391 cmp x24, #ESR_EL1_EC_UNKNOWN // unknown exception in EL0 392 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 403 cmp x24, #ESR_EL1_EC_BREAKPT_EL0 // debug exception in EL0 394 404 b.ge el0_dbg 395 405 b el0_inv
+12 -5
arch/arm64/kernel/traps.c
··· 267 267 return; 268 268 #endif 269 269 270 - if (show_unhandled_signals) { 270 + if (show_unhandled_signals && unhandled_signal(current, SIGILL) && 271 + printk_ratelimit()) { 271 272 pr_info("%s[%d]: undefined instruction: pc=%p\n", 272 273 current->comm, task_pid_nr(current), pc); 273 274 dump_instr(KERN_INFO, regs); ··· 295 294 } 296 295 #endif 297 296 298 - if (show_unhandled_signals) { 297 + if (show_unhandled_signals && printk_ratelimit()) { 299 298 pr_info("%s[%d]: syscall %d\n", current->comm, 300 299 task_pid_nr(current), (int)regs->syscallno); 301 300 dump_instr("", regs); ··· 311 310 */ 312 311 asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr) 313 312 { 313 + siginfo_t info; 314 + void __user *pc = (void __user *)instruction_pointer(regs); 314 315 console_verbose(); 315 316 316 317 pr_crit("Bad mode in %s handler detected, code 0x%08x\n", 317 318 handler[reason], esr); 319 + __show_regs(regs); 318 320 319 - die("Oops - bad mode", regs, 0); 320 - local_irq_disable(); 321 - panic("bad mode"); 321 + info.si_signo = SIGILL; 322 + info.si_errno = 0; 323 + info.si_code = ILL_ILLOPC; 324 + info.si_addr = pc; 325 + 326 + arm64_notify_die("Oops - bad mode", regs, &info, 0); 322 327 } 323 328 324 329 void __pte_error(const char *file, int line, unsigned long val)
+2 -1
arch/arm64/mm/fault.c
··· 113 113 { 114 114 struct siginfo si; 115 115 116 - if (show_unhandled_signals) { 116 + if (show_unhandled_signals && unhandled_signal(tsk, sig) && 117 + printk_ratelimit()) { 117 118 pr_info("%s[%d]: unhandled %s (%d) at 0x%08lx, esr 0x%03x\n", 118 119 tsk->comm, task_pid_nr(tsk), fault_name(esr), sig, 119 120 addr, esr);
+173 -57
arch/m68k/configs/amiga_defconfig
··· 1 - CONFIG_EXPERIMENTAL=y 2 1 CONFIG_LOCALVERSION="-amiga" 3 2 CONFIG_SYSVIPC=y 4 3 CONFIG_POSIX_MQUEUE=y 4 + CONFIG_FHANDLE=y 5 5 CONFIG_BSD_PROCESS_ACCT=y 6 - CONFIG_LOG_BUF_SHIFT=14 7 - CONFIG_RELAY=y 6 + CONFIG_BSD_PROCESS_ACCT_V3=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 12 CONFIG_BLK_DEV_INITRD=y 9 - # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 10 13 CONFIG_SLAB=y 11 14 CONFIG_MODULES=y 12 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 27 CONFIG_M68020=y 15 28 CONFIG_M68030=y 16 29 CONFIG_M68040=y 17 30 CONFIG_M68060=y 18 - CONFIG_BINFMT_AOUT=m 19 - CONFIG_BINFMT_MISC=m 31 + CONFIG_AMIGA=y 20 32 CONFIG_ZORRO=y 21 33 CONFIG_AMIGA_PCMCIA=y 22 - CONFIG_HEARTBEAT=y 23 - CONFIG_PROC_HARDWARE=y 24 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 40 CONFIG_NET=y 26 41 CONFIG_PACKET=y 42 + CONFIG_PACKET_DIAG=m 27 43 CONFIG_UNIX=y 44 + CONFIG_UNIX_DIAG=m 45 + CONFIG_XFRM_MIGRATE=y 28 46 CONFIG_NET_KEY=y 29 - CONFIG_NET_KEY_MIGRATE=y 30 47 CONFIG_INET=y 31 48 CONFIG_IP_PNP=y 49 + CONFIG_IP_PNP_DHCP=y 50 + CONFIG_IP_PNP_BOOTP=y 51 + CONFIG_IP_PNP_RARP=y 32 52 CONFIG_NET_IPIP=m 53 + CONFIG_NET_IPGRE_DEMUX=m 33 54 CONFIG_NET_IPGRE=m 34 55 CONFIG_SYN_COOKIES=y 56 + CONFIG_NET_IPVTI=m 35 57 CONFIG_INET_AH=m 36 58 CONFIG_INET_ESP=m 37 59 CONFIG_INET_IPCOMP=m 38 60 CONFIG_INET_XFRM_MODE_TRANSPORT=m 39 61 CONFIG_INET_XFRM_MODE_TUNNEL=m 40 62 CONFIG_INET_XFRM_MODE_BEET=m 63 + # CONFIG_INET_LRO is not set 41 64 CONFIG_INET_DIAG=m 65 + CONFIG_INET_UDP_DIAG=m 42 66 CONFIG_IPV6_PRIVACY=y 43 67 CONFIG_IPV6_ROUTER_PREF=y 44 - CONFIG_IPV6_ROUTE_INFO=y 45 68 CONFIG_INET6_AH=m 46 69 CONFIG_INET6_ESP=m 47 70 CONFIG_INET6_IPCOMP=m 48 - CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 49 - CONFIG_IPV6_TUNNEL=m 71 + CONFIG_IPV6_GRE=m 50 72 CONFIG_NETFILTER=y 51 - CONFIG_NETFILTER_NETLINK_QUEUE=m 52 73 CONFIG_NF_CONNTRACK=m 74 + CONFIG_NF_CONNTRACK_ZONES=y 75 + # CONFIG_NF_CONNTRACK_PROCFS is not set 53 76 # CONFIG_NF_CT_PROTO_DCCP is not set 54 77 CONFIG_NF_CT_PROTO_UDPLITE=m 55 78 CONFIG_NF_CONNTRACK_AMANDA=m ··· 80 57 CONFIG_NF_CONNTRACK_H323=m 81 58 CONFIG_NF_CONNTRACK_IRC=m 82 59 CONFIG_NF_CONNTRACK_NETBIOS_NS=m 60 + CONFIG_NF_CONNTRACK_SNMP=m 83 61 CONFIG_NF_CONNTRACK_PPTP=m 84 62 CONFIG_NF_CONNTRACK_SANE=m 85 63 CONFIG_NF_CONNTRACK_SIP=m 86 64 CONFIG_NF_CONNTRACK_TFTP=m 65 + CONFIG_NETFILTER_XT_SET=m 66 + CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 87 67 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 88 68 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 89 69 CONFIG_NETFILTER_XT_TARGET_DSCP=m 70 + CONFIG_NETFILTER_XT_TARGET_HMARK=m 71 + CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m 72 + CONFIG_NETFILTER_XT_TARGET_LOG=m 90 73 CONFIG_NETFILTER_XT_TARGET_MARK=m 91 74 CONFIG_NETFILTER_XT_TARGET_NFLOG=m 92 75 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 76 + CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 77 + CONFIG_NETFILTER_XT_TARGET_TEE=m 93 78 CONFIG_NETFILTER_XT_TARGET_TRACE=m 94 79 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 95 80 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 81 + CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m 82 + CONFIG_NETFILTER_XT_MATCH_BPF=m 96 83 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m 97 84 CONFIG_NETFILTER_XT_MATCH_COMMENT=m 98 85 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 86 + CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m 99 87 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 100 88 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 101 89 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 90 + CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m 102 91 CONFIG_NETFILTER_XT_MATCH_DSCP=m 103 92 CONFIG_NETFILTER_XT_MATCH_ESP=m 104 93 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m ··· 121 86 CONFIG_NETFILTER_XT_MATCH_MAC=m 122 87 CONFIG_NETFILTER_XT_MATCH_MARK=m 123 88 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 89 + CONFIG_NETFILTER_XT_MATCH_NFACCT=m 90 + CONFIG_NETFILTER_XT_MATCH_OSF=m 124 91 CONFIG_NETFILTER_XT_MATCH_OWNER=m 125 92 CONFIG_NETFILTER_XT_MATCH_POLICY=m 126 93 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m ··· 136 99 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 137 100 CONFIG_NETFILTER_XT_MATCH_TIME=m 138 101 CONFIG_NETFILTER_XT_MATCH_U32=m 102 + CONFIG_IP_SET=m 103 + CONFIG_IP_SET_BITMAP_IP=m 104 + CONFIG_IP_SET_BITMAP_IPMAC=m 105 + CONFIG_IP_SET_BITMAP_PORT=m 106 + CONFIG_IP_SET_HASH_IP=m 107 + CONFIG_IP_SET_HASH_IPPORT=m 108 + CONFIG_IP_SET_HASH_IPPORTIP=m 109 + CONFIG_IP_SET_HASH_IPPORTNET=m 110 + CONFIG_IP_SET_HASH_NET=m 111 + CONFIG_IP_SET_HASH_NETPORT=m 112 + CONFIG_IP_SET_HASH_NETIFACE=m 113 + CONFIG_IP_SET_LIST_SET=m 139 114 CONFIG_NF_CONNTRACK_IPV4=m 140 - CONFIG_IP_NF_QUEUE=m 141 115 CONFIG_IP_NF_IPTABLES=m 142 - CONFIG_IP_NF_MATCH_ADDRTYPE=m 143 116 CONFIG_IP_NF_MATCH_AH=m 144 117 CONFIG_IP_NF_MATCH_ECN=m 118 + CONFIG_IP_NF_MATCH_RPFILTER=m 145 119 CONFIG_IP_NF_MATCH_TTL=m 146 120 CONFIG_IP_NF_FILTER=m 147 121 CONFIG_IP_NF_TARGET_REJECT=m 148 - CONFIG_IP_NF_TARGET_LOG=m 149 122 CONFIG_IP_NF_TARGET_ULOG=m 150 - CONFIG_NF_NAT=m 123 + CONFIG_NF_NAT_IPV4=m 151 124 CONFIG_IP_NF_TARGET_MASQUERADE=m 152 125 CONFIG_IP_NF_TARGET_NETMAP=m 153 126 CONFIG_IP_NF_TARGET_REDIRECT=m 154 - CONFIG_NF_NAT_SNMP_BASIC=m 155 127 CONFIG_IP_NF_MANGLE=m 156 128 CONFIG_IP_NF_TARGET_CLUSTERIP=m 157 129 CONFIG_IP_NF_TARGET_ECN=m ··· 170 124 CONFIG_IP_NF_ARPFILTER=m 171 125 CONFIG_IP_NF_ARP_MANGLE=m 172 126 CONFIG_NF_CONNTRACK_IPV6=m 173 - CONFIG_IP6_NF_QUEUE=m 174 127 CONFIG_IP6_NF_IPTABLES=m 175 128 CONFIG_IP6_NF_MATCH_AH=m 176 129 CONFIG_IP6_NF_MATCH_EUI64=m ··· 178 133 CONFIG_IP6_NF_MATCH_HL=m 179 134 CONFIG_IP6_NF_MATCH_IPV6HEADER=m 180 135 CONFIG_IP6_NF_MATCH_MH=m 136 + CONFIG_IP6_NF_MATCH_RPFILTER=m 181 137 CONFIG_IP6_NF_MATCH_RT=m 182 138 CONFIG_IP6_NF_TARGET_HL=m 183 - CONFIG_IP6_NF_TARGET_LOG=m 184 139 CONFIG_IP6_NF_FILTER=m 185 140 CONFIG_IP6_NF_TARGET_REJECT=m 186 141 CONFIG_IP6_NF_MANGLE=m 187 142 CONFIG_IP6_NF_RAW=m 143 + CONFIG_NF_NAT_IPV6=m 144 + CONFIG_IP6_NF_TARGET_MASQUERADE=m 145 + CONFIG_IP6_NF_TARGET_NPT=m 188 146 CONFIG_IP_DCCP=m 189 147 # CONFIG_IP_DCCP_CCID3 is not set 148 + CONFIG_SCTP_COOKIE_HMAC_SHA1=y 149 + CONFIG_RDS=m 150 + CONFIG_RDS_TCP=m 151 + CONFIG_L2TP=m 190 152 CONFIG_ATALK=m 153 + CONFIG_BATMAN_ADV=m 154 + CONFIG_BATMAN_ADV_DAT=y 155 + # CONFIG_WIRELESS is not set 191 156 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 157 + CONFIG_DEVTMPFS=y 192 158 # CONFIG_FIRMWARE_IN_KERNEL is not set 159 + # CONFIG_FW_LOADER_USER_HELPER is not set 193 160 CONFIG_CONNECTOR=m 194 161 CONFIG_PARPORT=m 195 162 CONFIG_PARPORT_AMIGA=m ··· 211 154 CONFIG_AMIGA_Z2RAM=y 212 155 CONFIG_BLK_DEV_LOOP=y 213 156 CONFIG_BLK_DEV_CRYPTOLOOP=m 157 + CONFIG_BLK_DEV_DRBD=m 214 158 CONFIG_BLK_DEV_NBD=m 215 159 CONFIG_BLK_DEV_RAM=y 216 160 CONFIG_CDROM_PKTCDVD=m 217 161 CONFIG_ATA_OVER_ETH=m 218 162 CONFIG_IDE=y 163 + CONFIG_IDE_GD_ATAPI=y 219 164 CONFIG_BLK_DEV_IDECD=y 220 165 CONFIG_BLK_DEV_GAYLE=y 221 166 CONFIG_BLK_DEV_BUDDHA=y ··· 231 172 CONFIG_BLK_DEV_SR_VENDOR=y 232 173 CONFIG_CHR_DEV_SG=m 233 174 CONFIG_SCSI_CONSTANTS=y 234 - CONFIG_SCSI_SAS_LIBSAS=m 235 - # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set 236 - CONFIG_SCSI_SRP_ATTRS=m 237 - CONFIG_SCSI_SRP_TGT_ATTRS=y 175 + CONFIG_SCSI_SAS_ATTRS=m 238 176 CONFIG_ISCSI_TCP=m 177 + CONFIG_ISCSI_BOOT_SYSFS=m 239 178 CONFIG_A3000_SCSI=y 240 179 CONFIG_A2091_SCSI=y 241 180 CONFIG_GVP11_SCSI=y 242 181 CONFIG_SCSI_A4000T=y 243 182 CONFIG_SCSI_ZORRO7XX=y 244 183 CONFIG_MD=y 245 - CONFIG_BLK_DEV_MD=m 246 184 CONFIG_MD_LINEAR=m 247 185 CONFIG_MD_RAID0=m 248 - CONFIG_MD_RAID1=m 249 - CONFIG_MD_RAID456=m 250 186 CONFIG_BLK_DEV_DM=m 251 187 CONFIG_DM_CRYPT=m 252 188 CONFIG_DM_SNAPSHOT=m 189 + CONFIG_DM_THIN_PROVISIONING=m 190 + CONFIG_DM_CACHE=m 253 191 CONFIG_DM_MIRROR=m 192 + CONFIG_DM_RAID=m 254 193 CONFIG_DM_ZERO=m 255 194 CONFIG_DM_MULTIPATH=m 256 195 CONFIG_DM_UEVENT=y 196 + CONFIG_TARGET_CORE=m 197 + CONFIG_TCM_IBLOCK=m 198 + CONFIG_TCM_FILEIO=m 199 + CONFIG_TCM_PSCSI=m 257 200 CONFIG_NETDEVICES=y 258 201 CONFIG_DUMMY=m 259 - CONFIG_MACVLAN=m 260 202 CONFIG_EQUALIZER=m 203 + CONFIG_NET_TEAM=m 204 + CONFIG_NET_TEAM_MODE_BROADCAST=m 205 + CONFIG_NET_TEAM_MODE_ROUNDROBIN=m 206 + CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 207 + CONFIG_NET_TEAM_MODE_LOADBALANCE=m 208 + CONFIG_VXLAN=m 209 + CONFIG_NETCONSOLE=m 210 + CONFIG_NETCONSOLE_DYNAMIC=y 261 211 CONFIG_VETH=m 262 - CONFIG_NET_ETHERNET=y 263 - CONFIG_ARIADNE=y 212 + # CONFIG_NET_VENDOR_3COM is not set 264 213 CONFIG_A2065=y 214 + CONFIG_ARIADNE=y 215 + # CONFIG_NET_CADENCE is not set 216 + # CONFIG_NET_VENDOR_BROADCOM is not set 217 + # CONFIG_NET_VENDOR_CIRRUS is not set 218 + # CONFIG_NET_VENDOR_FUJITSU is not set 219 + # CONFIG_NET_VENDOR_HP is not set 220 + # CONFIG_NET_VENDOR_INTEL is not set 221 + # CONFIG_NET_VENDOR_MARVELL is not set 222 + # CONFIG_NET_VENDOR_MICREL is not set 265 223 CONFIG_HYDRA=y 266 - CONFIG_ZORRO8390=y 267 224 CONFIG_APNE=y 268 - # CONFIG_NETDEV_1000 is not set 269 - # CONFIG_NETDEV_10000 is not set 225 + CONFIG_ZORRO8390=y 226 + # CONFIG_NET_VENDOR_SEEQ is not set 227 + # CONFIG_NET_VENDOR_SMSC is not set 228 + # CONFIG_NET_VENDOR_STMICRO is not set 229 + # CONFIG_NET_VENDOR_WIZNET is not set 270 230 CONFIG_PPP=m 271 - CONFIG_PPP_FILTER=y 272 - CONFIG_PPP_ASYNC=m 273 - CONFIG_PPP_SYNC_TTY=m 274 - CONFIG_PPP_DEFLATE=m 275 231 CONFIG_PPP_BSDCOMP=m 232 + CONFIG_PPP_DEFLATE=m 233 + CONFIG_PPP_FILTER=y 276 234 CONFIG_PPP_MPPE=m 277 235 CONFIG_PPPOE=m 236 + CONFIG_PPTP=m 237 + CONFIG_PPPOL2TP=m 238 + CONFIG_PPP_ASYNC=m 239 + CONFIG_PPP_SYNC_TTY=m 278 240 CONFIG_SLIP=m 279 241 CONFIG_SLIP_COMPRESSED=y 280 242 CONFIG_SLIP_SMART=y 281 243 CONFIG_SLIP_MODE_SLIP6=y 282 - CONFIG_NETCONSOLE=m 283 - CONFIG_NETCONSOLE_DYNAMIC=y 284 - CONFIG_INPUT_FF_MEMLESS=m 244 + # CONFIG_WLAN is not set 245 + CONFIG_INPUT_EVDEV=m 285 246 CONFIG_KEYBOARD_AMIGA=y 286 247 # CONFIG_KEYBOARD_ATKBD is not set 287 248 # CONFIG_MOUSE_PS2 is not set ··· 312 233 CONFIG_INPUT_M68K_BEEP=m 313 234 # CONFIG_SERIO is not set 314 235 CONFIG_VT_HW_CONSOLE_BINDING=y 236 + # CONFIG_LEGACY_PTYS is not set 315 237 # CONFIG_DEVKMEM is not set 316 238 CONFIG_PRINTER=m 317 239 # CONFIG_HW_RANDOM is not set 318 - CONFIG_GEN_RTC=m 319 - CONFIG_GEN_RTC_X=y 240 + CONFIG_NTP_PPS=y 241 + CONFIG_PPS_CLIENT_LDISC=m 242 + CONFIG_PPS_CLIENT_PARPORT=m 243 + CONFIG_PTP_1588_CLOCK=m 320 244 # CONFIG_HWMON is not set 321 245 CONFIG_FB=y 322 246 CONFIG_FB_CIRRUS=y ··· 334 252 CONFIG_DMASOUND_PAULA=m 335 253 CONFIG_HID=m 336 254 CONFIG_HIDRAW=y 255 + CONFIG_UHID=m 256 + # CONFIG_HID_GENERIC is not set 337 257 # CONFIG_USB_SUPPORT is not set 258 + CONFIG_RTC_CLASS=y 259 + CONFIG_RTC_DRV_MSM6242=m 260 + CONFIG_RTC_DRV_RP5C01=m 261 + # CONFIG_IOMMU_SUPPORT is not set 262 + CONFIG_HEARTBEAT=y 263 + CONFIG_PROC_HARDWARE=y 338 264 CONFIG_AMIGA_BUILTIN_SERIAL=y 339 265 CONFIG_SERIAL_CONSOLE=y 340 266 CONFIG_EXT2_FS=y 341 267 CONFIG_EXT3_FS=y 342 268 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 343 269 # CONFIG_EXT3_FS_XATTR is not set 270 + CONFIG_EXT4_FS=y 344 271 CONFIG_REISERFS_FS=m 345 272 CONFIG_JFS_FS=m 346 273 CONFIG_XFS_FS=m 347 274 CONFIG_OCFS2_FS=m 348 - # CONFIG_OCFS2_FS_STATS is not set 349 275 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 276 + CONFIG_FANOTIFY=y 350 277 CONFIG_QUOTA_NETLINK_INTERFACE=y 351 278 # CONFIG_PRINT_QUOTA_WARNING is not set 352 - CONFIG_AUTOFS_FS=m 353 279 CONFIG_AUTOFS4_FS=m 354 280 CONFIG_FUSE_FS=m 281 + CONFIG_CUSE=m 355 282 CONFIG_ISO9660_FS=y 356 283 CONFIG_JOLIET=y 357 284 CONFIG_ZISOFS=y 358 285 CONFIG_UDF_FS=m 359 - CONFIG_MSDOS_FS=y 286 + CONFIG_MSDOS_FS=m 360 287 CONFIG_VFAT_FS=m 361 288 CONFIG_PROC_KCORE=y 362 289 CONFIG_TMPFS=y 363 290 CONFIG_AFFS_FS=m 291 + CONFIG_ECRYPT_FS=m 292 + CONFIG_ECRYPT_FS_MESSAGING=y 364 293 CONFIG_HFS_FS=m 365 294 CONFIG_HFSPLUS_FS=m 366 295 CONFIG_CRAMFS=m 367 296 CONFIG_SQUASHFS=m 368 - CONFIG_MINIX_FS=y 297 + CONFIG_SQUASHFS_LZO=y 298 + CONFIG_MINIX_FS=m 299 + CONFIG_OMFS_FS=m 369 300 CONFIG_HPFS_FS=m 301 + CONFIG_QNX4FS_FS=m 302 + CONFIG_QNX6FS_FS=m 370 303 CONFIG_SYSV_FS=m 371 304 CONFIG_UFS_FS=m 372 305 CONFIG_NFS_FS=y 373 - CONFIG_NFS_V3=y 374 306 CONFIG_NFS_V4=y 307 + CONFIG_NFS_SWAP=y 308 + CONFIG_ROOT_NFS=y 375 309 CONFIG_NFSD=m 376 310 CONFIG_NFSD_V3=y 377 - CONFIG_SMB_FS=m 378 - CONFIG_SMB_NLS_DEFAULT=y 311 + CONFIG_CIFS=m 312 + # CONFIG_CIFS_DEBUG is not set 379 313 CONFIG_CODA_FS=m 380 314 CONFIG_NLS_CODEPAGE_437=y 381 315 CONFIG_NLS_CODEPAGE_737=m ··· 430 332 CONFIG_NLS_ISO8859_15=m 431 333 CONFIG_NLS_KOI8_R=m 432 334 CONFIG_NLS_KOI8_U=m 335 + CONFIG_NLS_MAC_ROMAN=m 336 + CONFIG_NLS_MAC_CELTIC=m 337 + CONFIG_NLS_MAC_CENTEURO=m 338 + CONFIG_NLS_MAC_CROATIAN=m 339 + CONFIG_NLS_MAC_CYRILLIC=m 340 + CONFIG_NLS_MAC_GAELIC=m 341 + CONFIG_NLS_MAC_GREEK=m 342 + CONFIG_NLS_MAC_ICELAND=m 343 + CONFIG_NLS_MAC_INUIT=m 344 + CONFIG_NLS_MAC_ROMANIAN=m 345 + CONFIG_NLS_MAC_TURKISH=m 433 346 CONFIG_DLM=m 434 347 CONFIG_MAGIC_SYSRQ=y 435 - # CONFIG_RCU_CPU_STALL_DETECTOR is not set 436 - CONFIG_SYSCTL_SYSCALL_CHECK=y 348 + CONFIG_ASYNC_RAID6_TEST=m 349 + CONFIG_ENCRYPTED_KEYS=m 350 + CONFIG_CRYPTO_MANAGER=y 351 + CONFIG_CRYPTO_USER=m 437 352 CONFIG_CRYPTO_NULL=m 438 353 CONFIG_CRYPTO_CRYPTD=m 439 354 CONFIG_CRYPTO_TEST=m ··· 456 345 CONFIG_CRYPTO_LRW=m 457 346 CONFIG_CRYPTO_PCBC=m 458 347 CONFIG_CRYPTO_XTS=m 459 - CONFIG_CRYPTO_HMAC=y 460 348 CONFIG_CRYPTO_XCBC=m 461 - CONFIG_CRYPTO_MD4=m 349 + CONFIG_CRYPTO_VMAC=m 462 350 CONFIG_CRYPTO_MICHAEL_MIC=m 463 351 CONFIG_CRYPTO_RMD128=m 464 352 CONFIG_CRYPTO_RMD160=m 465 353 CONFIG_CRYPTO_RMD256=m 466 354 CONFIG_CRYPTO_RMD320=m 467 - CONFIG_CRYPTO_SHA256=m 468 355 CONFIG_CRYPTO_SHA512=m 469 356 CONFIG_CRYPTO_TGR192=m 470 357 CONFIG_CRYPTO_WP512=m 471 - CONFIG_CRYPTO_AES=m 472 358 CONFIG_CRYPTO_ANUBIS=m 473 359 CONFIG_CRYPTO_BLOWFISH=m 474 360 CONFIG_CRYPTO_CAMELLIA=m ··· 481 373 CONFIG_CRYPTO_ZLIB=m 482 374 CONFIG_CRYPTO_LZO=m 483 375 # CONFIG_CRYPTO_ANSI_CPRNG is not set 376 + CONFIG_CRYPTO_USER_API_HASH=m 377 + CONFIG_CRYPTO_USER_API_SKCIPHER=m 484 378 # CONFIG_CRYPTO_HW is not set 485 - CONFIG_CRC16=m 486 379 CONFIG_CRC_T10DIF=y 380 + CONFIG_XZ_DEC_X86=y 381 + CONFIG_XZ_DEC_POWERPC=y 382 + CONFIG_XZ_DEC_IA64=y 383 + CONFIG_XZ_DEC_ARM=y 384 + CONFIG_XZ_DEC_ARMTHUMB=y 385 + CONFIG_XZ_DEC_SPARC=y 386 + CONFIG_XZ_DEC_TEST=m
+160 -55
arch/m68k/configs/apollo_defconfig
··· 1 - CONFIG_EXPERIMENTAL=y 2 1 CONFIG_LOCALVERSION="-apollo" 3 2 CONFIG_SYSVIPC=y 4 3 CONFIG_POSIX_MQUEUE=y 4 + CONFIG_FHANDLE=y 5 5 CONFIG_BSD_PROCESS_ACCT=y 6 - CONFIG_LOG_BUF_SHIFT=14 7 - CONFIG_RELAY=y 6 + CONFIG_BSD_PROCESS_ACCT_V3=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 12 CONFIG_BLK_DEV_INITRD=y 9 - # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 10 13 CONFIG_SLAB=y 11 14 CONFIG_MODULES=y 12 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 28 CONFIG_M68020=y 15 29 CONFIG_M68030=y 16 30 CONFIG_M68040=y 17 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 36 CONFIG_BINFMT_AOUT=m 19 37 CONFIG_BINFMT_MISC=m 20 - CONFIG_HEARTBEAT=y 21 - CONFIG_PROC_HARDWARE=y 22 38 CONFIG_NET=y 23 39 CONFIG_PACKET=y 40 + CONFIG_PACKET_DIAG=m 24 41 CONFIG_UNIX=y 42 + CONFIG_UNIX_DIAG=m 43 + CONFIG_XFRM_MIGRATE=y 25 44 CONFIG_NET_KEY=y 26 - CONFIG_NET_KEY_MIGRATE=y 27 45 CONFIG_INET=y 28 46 CONFIG_IP_PNP=y 29 47 CONFIG_IP_PNP_DHCP=y 30 48 CONFIG_IP_PNP_BOOTP=y 31 49 CONFIG_IP_PNP_RARP=y 32 50 CONFIG_NET_IPIP=m 51 + CONFIG_NET_IPGRE_DEMUX=m 33 52 CONFIG_NET_IPGRE=m 34 53 CONFIG_SYN_COOKIES=y 54 + CONFIG_NET_IPVTI=m 35 55 CONFIG_INET_AH=m 36 56 CONFIG_INET_ESP=m 37 57 CONFIG_INET_IPCOMP=m 38 58 CONFIG_INET_XFRM_MODE_TRANSPORT=m 39 59 CONFIG_INET_XFRM_MODE_TUNNEL=m 40 60 CONFIG_INET_XFRM_MODE_BEET=m 61 + # CONFIG_INET_LRO is not set 41 62 CONFIG_INET_DIAG=m 63 + CONFIG_INET_UDP_DIAG=m 42 64 CONFIG_IPV6_PRIVACY=y 43 65 CONFIG_IPV6_ROUTER_PREF=y 44 - CONFIG_IPV6_ROUTE_INFO=y 45 66 CONFIG_INET6_AH=m 46 67 CONFIG_INET6_ESP=m 47 68 CONFIG_INET6_IPCOMP=m 48 - CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 49 - CONFIG_IPV6_TUNNEL=m 69 + CONFIG_IPV6_GRE=m 50 70 CONFIG_NETFILTER=y 51 - CONFIG_NETFILTER_NETLINK_QUEUE=m 52 71 CONFIG_NF_CONNTRACK=m 72 + CONFIG_NF_CONNTRACK_ZONES=y 73 + # CONFIG_NF_CONNTRACK_PROCFS is not set 53 74 # CONFIG_NF_CT_PROTO_DCCP is not set 54 75 CONFIG_NF_CT_PROTO_UDPLITE=m 55 76 CONFIG_NF_CONNTRACK_AMANDA=m ··· 78 57 CONFIG_NF_CONNTRACK_H323=m 79 58 CONFIG_NF_CONNTRACK_IRC=m 80 59 CONFIG_NF_CONNTRACK_NETBIOS_NS=m 60 + CONFIG_NF_CONNTRACK_SNMP=m 81 61 CONFIG_NF_CONNTRACK_PPTP=m 82 62 CONFIG_NF_CONNTRACK_SANE=m 83 63 CONFIG_NF_CONNTRACK_SIP=m 84 64 CONFIG_NF_CONNTRACK_TFTP=m 65 + CONFIG_NETFILTER_XT_SET=m 66 + CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 85 67 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 86 68 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 87 69 CONFIG_NETFILTER_XT_TARGET_DSCP=m 70 + CONFIG_NETFILTER_XT_TARGET_HMARK=m 71 + CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m 72 + CONFIG_NETFILTER_XT_TARGET_LOG=m 88 73 CONFIG_NETFILTER_XT_TARGET_MARK=m 89 74 CONFIG_NETFILTER_XT_TARGET_NFLOG=m 90 75 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 76 + CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 77 + CONFIG_NETFILTER_XT_TARGET_TEE=m 91 78 CONFIG_NETFILTER_XT_TARGET_TRACE=m 92 79 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 93 80 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 81 + CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m 82 + CONFIG_NETFILTER_XT_MATCH_BPF=m 94 83 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m 95 84 CONFIG_NETFILTER_XT_MATCH_COMMENT=m 96 85 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 86 + CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m 97 87 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 98 88 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 99 89 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 90 + CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m 100 91 CONFIG_NETFILTER_XT_MATCH_DSCP=m 101 92 CONFIG_NETFILTER_XT_MATCH_ESP=m 102 93 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m ··· 119 86 CONFIG_NETFILTER_XT_MATCH_MAC=m 120 87 CONFIG_NETFILTER_XT_MATCH_MARK=m 121 88 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 89 + CONFIG_NETFILTER_XT_MATCH_NFACCT=m 90 + CONFIG_NETFILTER_XT_MATCH_OSF=m 122 91 CONFIG_NETFILTER_XT_MATCH_OWNER=m 123 92 CONFIG_NETFILTER_XT_MATCH_POLICY=m 124 93 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m ··· 134 99 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 135 100 CONFIG_NETFILTER_XT_MATCH_TIME=m 136 101 CONFIG_NETFILTER_XT_MATCH_U32=m 102 + CONFIG_IP_SET=m 103 + CONFIG_IP_SET_BITMAP_IP=m 104 + CONFIG_IP_SET_BITMAP_IPMAC=m 105 + CONFIG_IP_SET_BITMAP_PORT=m 106 + CONFIG_IP_SET_HASH_IP=m 107 + CONFIG_IP_SET_HASH_IPPORT=m 108 + CONFIG_IP_SET_HASH_IPPORTIP=m 109 + CONFIG_IP_SET_HASH_IPPORTNET=m 110 + CONFIG_IP_SET_HASH_NET=m 111 + CONFIG_IP_SET_HASH_NETPORT=m 112 + CONFIG_IP_SET_HASH_NETIFACE=m 113 + CONFIG_IP_SET_LIST_SET=m 137 114 CONFIG_NF_CONNTRACK_IPV4=m 138 - CONFIG_IP_NF_QUEUE=m 139 115 CONFIG_IP_NF_IPTABLES=m 140 - CONFIG_IP_NF_MATCH_ADDRTYPE=m 141 116 CONFIG_IP_NF_MATCH_AH=m 142 117 CONFIG_IP_NF_MATCH_ECN=m 118 + CONFIG_IP_NF_MATCH_RPFILTER=m 143 119 CONFIG_IP_NF_MATCH_TTL=m 144 120 CONFIG_IP_NF_FILTER=m 145 121 CONFIG_IP_NF_TARGET_REJECT=m 146 - CONFIG_IP_NF_TARGET_LOG=m 147 122 CONFIG_IP_NF_TARGET_ULOG=m 148 - CONFIG_NF_NAT=m 123 + CONFIG_NF_NAT_IPV4=m 149 124 CONFIG_IP_NF_TARGET_MASQUERADE=m 150 125 CONFIG_IP_NF_TARGET_NETMAP=m 151 126 CONFIG_IP_NF_TARGET_REDIRECT=m 152 - CONFIG_NF_NAT_SNMP_BASIC=m 153 127 CONFIG_IP_NF_MANGLE=m 154 128 CONFIG_IP_NF_TARGET_CLUSTERIP=m 155 129 CONFIG_IP_NF_TARGET_ECN=m ··· 168 124 CONFIG_IP_NF_ARPFILTER=m 169 125 CONFIG_IP_NF_ARP_MANGLE=m 170 126 CONFIG_NF_CONNTRACK_IPV6=m 171 - CONFIG_IP6_NF_QUEUE=m 172 127 CONFIG_IP6_NF_IPTABLES=m 173 128 CONFIG_IP6_NF_MATCH_AH=m 174 129 CONFIG_IP6_NF_MATCH_EUI64=m ··· 176 133 CONFIG_IP6_NF_MATCH_HL=m 177 134 CONFIG_IP6_NF_MATCH_IPV6HEADER=m 178 135 CONFIG_IP6_NF_MATCH_MH=m 136 + CONFIG_IP6_NF_MATCH_RPFILTER=m 179 137 CONFIG_IP6_NF_MATCH_RT=m 180 138 CONFIG_IP6_NF_TARGET_HL=m 181 - CONFIG_IP6_NF_TARGET_LOG=m 182 139 CONFIG_IP6_NF_FILTER=m 183 140 CONFIG_IP6_NF_TARGET_REJECT=m 184 141 CONFIG_IP6_NF_MANGLE=m 185 142 CONFIG_IP6_NF_RAW=m 143 + CONFIG_NF_NAT_IPV6=m 144 + CONFIG_IP6_NF_TARGET_MASQUERADE=m 145 + CONFIG_IP6_NF_TARGET_NPT=m 186 146 CONFIG_IP_DCCP=m 187 147 # CONFIG_IP_DCCP_CCID3 is not set 148 + CONFIG_SCTP_COOKIE_HMAC_SHA1=y 149 + CONFIG_RDS=m 150 + CONFIG_RDS_TCP=m 151 + CONFIG_L2TP=m 188 152 CONFIG_ATALK=m 153 + CONFIG_BATMAN_ADV=m 154 + CONFIG_BATMAN_ADV_DAT=y 155 + # CONFIG_WIRELESS is not set 189 156 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 157 + CONFIG_DEVTMPFS=y 190 158 # CONFIG_FIRMWARE_IN_KERNEL is not set 159 + # CONFIG_FW_LOADER_USER_HELPER is not set 191 160 CONFIG_CONNECTOR=m 192 161 CONFIG_BLK_DEV_LOOP=y 193 162 CONFIG_BLK_DEV_CRYPTOLOOP=m 163 + CONFIG_BLK_DEV_DRBD=m 194 164 CONFIG_BLK_DEV_NBD=m 195 165 CONFIG_BLK_DEV_RAM=y 196 166 CONFIG_CDROM_PKTCDVD=m ··· 218 162 CONFIG_BLK_DEV_SR_VENDOR=y 219 163 CONFIG_CHR_DEV_SG=m 220 164 CONFIG_SCSI_CONSTANTS=y 221 - CONFIG_SCSI_SAS_LIBSAS=m 222 - # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set 223 - CONFIG_SCSI_SRP_ATTRS=m 224 - CONFIG_SCSI_SRP_TGT_ATTRS=y 165 + CONFIG_SCSI_SAS_ATTRS=m 225 166 CONFIG_ISCSI_TCP=m 167 + CONFIG_ISCSI_BOOT_SYSFS=m 226 168 CONFIG_MD=y 227 - CONFIG_BLK_DEV_MD=m 228 169 CONFIG_MD_LINEAR=m 229 170 CONFIG_MD_RAID0=m 230 - CONFIG_MD_RAID1=m 231 - CONFIG_MD_RAID456=m 232 171 CONFIG_BLK_DEV_DM=m 233 172 CONFIG_DM_CRYPT=m 234 173 CONFIG_DM_SNAPSHOT=m 174 + CONFIG_DM_THIN_PROVISIONING=m 175 + CONFIG_DM_CACHE=m 235 176 CONFIG_DM_MIRROR=m 177 + CONFIG_DM_RAID=m 236 178 CONFIG_DM_ZERO=m 237 179 CONFIG_DM_MULTIPATH=m 238 180 CONFIG_DM_UEVENT=y 181 + CONFIG_TARGET_CORE=m 182 + CONFIG_TCM_IBLOCK=m 183 + CONFIG_TCM_FILEIO=m 184 + CONFIG_TCM_PSCSI=m 239 185 CONFIG_NETDEVICES=y 240 186 CONFIG_DUMMY=m 241 - CONFIG_MACVLAN=m 242 187 CONFIG_EQUALIZER=m 188 + CONFIG_NET_TEAM=m 189 + CONFIG_NET_TEAM_MODE_BROADCAST=m 190 + CONFIG_NET_TEAM_MODE_ROUNDROBIN=m 191 + CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 192 + CONFIG_NET_TEAM_MODE_LOADBALANCE=m 193 + CONFIG_VXLAN=m 194 + CONFIG_NETCONSOLE=m 195 + CONFIG_NETCONSOLE_DYNAMIC=y 243 196 CONFIG_VETH=m 244 - CONFIG_NET_ETHERNET=y 245 - # CONFIG_NETDEV_1000 is not set 246 - # CONFIG_NETDEV_10000 is not set 197 + # CONFIG_NET_CADENCE is not set 198 + # CONFIG_NET_VENDOR_BROADCOM is not set 199 + # CONFIG_NET_VENDOR_INTEL is not set 200 + # CONFIG_NET_VENDOR_MARVELL is not set 201 + # CONFIG_NET_VENDOR_MICREL is not set 202 + # CONFIG_NET_VENDOR_NATSEMI is not set 203 + # CONFIG_NET_VENDOR_SEEQ is not set 204 + # CONFIG_NET_VENDOR_STMICRO is not set 205 + # CONFIG_NET_VENDOR_WIZNET is not set 247 206 CONFIG_PPP=m 248 - CONFIG_PPP_FILTER=y 249 - CONFIG_PPP_ASYNC=m 250 - CONFIG_PPP_SYNC_TTY=m 251 - CONFIG_PPP_DEFLATE=m 252 207 CONFIG_PPP_BSDCOMP=m 208 + CONFIG_PPP_DEFLATE=m 209 + CONFIG_PPP_FILTER=y 253 210 CONFIG_PPP_MPPE=m 254 211 CONFIG_PPPOE=m 212 + CONFIG_PPTP=m 213 + CONFIG_PPPOL2TP=m 214 + CONFIG_PPP_ASYNC=m 215 + CONFIG_PPP_SYNC_TTY=m 255 216 CONFIG_SLIP=m 256 217 CONFIG_SLIP_COMPRESSED=y 257 218 CONFIG_SLIP_SMART=y 258 219 CONFIG_SLIP_MODE_SLIP6=y 259 - CONFIG_NETCONSOLE=m 260 - CONFIG_NETCONSOLE_DYNAMIC=y 261 - CONFIG_INPUT_FF_MEMLESS=m 220 + # CONFIG_WLAN is not set 221 + CONFIG_INPUT_EVDEV=m 262 222 # CONFIG_KEYBOARD_ATKBD is not set 263 - CONFIG_MOUSE_PS2=m 223 + # CONFIG_MOUSE_PS2 is not set 264 224 CONFIG_MOUSE_SERIAL=m 265 225 CONFIG_SERIO=m 266 - # CONFIG_SERIO_SERPORT is not set 267 226 CONFIG_VT_HW_CONSOLE_BINDING=y 227 + # CONFIG_LEGACY_PTYS is not set 268 228 # CONFIG_DEVKMEM is not set 269 229 # CONFIG_HW_RANDOM is not set 270 - CONFIG_GEN_RTC=m 271 - CONFIG_GEN_RTC_X=y 230 + CONFIG_NTP_PPS=y 231 + CONFIG_PPS_CLIENT_LDISC=m 232 + CONFIG_PTP_1588_CLOCK=m 272 233 # CONFIG_HWMON is not set 273 234 CONFIG_FB=y 274 235 CONFIG_FRAMEBUFFER_CONSOLE=y ··· 294 221 # CONFIG_LOGO_LINUX_CLUT224 is not set 295 222 CONFIG_HID=m 296 223 CONFIG_HIDRAW=y 224 + CONFIG_UHID=m 225 + # CONFIG_HID_GENERIC is not set 297 226 # CONFIG_USB_SUPPORT is not set 227 + CONFIG_RTC_CLASS=y 228 + CONFIG_RTC_DRV_GENERIC=m 229 + # CONFIG_IOMMU_SUPPORT is not set 230 + CONFIG_HEARTBEAT=y 231 + CONFIG_PROC_HARDWARE=y 298 232 CONFIG_EXT2_FS=y 299 233 CONFIG_EXT3_FS=y 300 234 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 301 235 # CONFIG_EXT3_FS_XATTR is not set 236 + CONFIG_EXT4_FS=y 302 237 CONFIG_REISERFS_FS=m 303 238 CONFIG_JFS_FS=m 304 239 CONFIG_XFS_FS=m 305 240 CONFIG_OCFS2_FS=m 306 - # CONFIG_OCFS2_FS_STATS is not set 307 241 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 242 + CONFIG_FANOTIFY=y 308 243 CONFIG_QUOTA_NETLINK_INTERFACE=y 309 244 # CONFIG_PRINT_QUOTA_WARNING is not set 310 - CONFIG_AUTOFS_FS=m 311 245 CONFIG_AUTOFS4_FS=m 312 246 CONFIG_FUSE_FS=m 247 + CONFIG_CUSE=m 313 248 CONFIG_ISO9660_FS=y 314 249 CONFIG_JOLIET=y 315 250 CONFIG_ZISOFS=y 316 251 CONFIG_UDF_FS=m 317 - CONFIG_MSDOS_FS=y 252 + CONFIG_MSDOS_FS=m 318 253 CONFIG_VFAT_FS=m 319 254 CONFIG_PROC_KCORE=y 320 255 CONFIG_TMPFS=y 321 256 CONFIG_AFFS_FS=m 257 + CONFIG_ECRYPT_FS=m 258 + CONFIG_ECRYPT_FS_MESSAGING=y 322 259 CONFIG_HFS_FS=m 323 260 CONFIG_HFSPLUS_FS=m 324 261 CONFIG_CRAMFS=m 325 262 CONFIG_SQUASHFS=m 326 - CONFIG_MINIX_FS=y 263 + CONFIG_SQUASHFS_LZO=y 264 + CONFIG_MINIX_FS=m 265 + CONFIG_OMFS_FS=m 327 266 CONFIG_HPFS_FS=m 267 + CONFIG_QNX4FS_FS=m 268 + CONFIG_QNX6FS_FS=m 328 269 CONFIG_SYSV_FS=m 329 270 CONFIG_UFS_FS=m 330 271 CONFIG_NFS_FS=y 331 - CONFIG_NFS_V3=y 332 272 CONFIG_NFS_V4=y 273 + CONFIG_NFS_SWAP=y 333 274 CONFIG_ROOT_NFS=y 334 275 CONFIG_NFSD=m 335 276 CONFIG_NFSD_V3=y 336 - CONFIG_SMB_FS=m 337 - CONFIG_SMB_NLS_DEFAULT=y 277 + CONFIG_CIFS=m 278 + # CONFIG_CIFS_DEBUG is not set 338 279 CONFIG_CODA_FS=m 339 280 CONFIG_NLS_CODEPAGE_437=y 340 281 CONFIG_NLS_CODEPAGE_737=m ··· 387 300 CONFIG_NLS_ISO8859_15=m 388 301 CONFIG_NLS_KOI8_R=m 389 302 CONFIG_NLS_KOI8_U=m 303 + CONFIG_NLS_MAC_ROMAN=m 304 + CONFIG_NLS_MAC_CELTIC=m 305 + CONFIG_NLS_MAC_CENTEURO=m 306 + CONFIG_NLS_MAC_CROATIAN=m 307 + CONFIG_NLS_MAC_CYRILLIC=m 308 + CONFIG_NLS_MAC_GAELIC=m 309 + CONFIG_NLS_MAC_GREEK=m 310 + CONFIG_NLS_MAC_ICELAND=m 311 + CONFIG_NLS_MAC_INUIT=m 312 + CONFIG_NLS_MAC_ROMANIAN=m 313 + CONFIG_NLS_MAC_TURKISH=m 390 314 CONFIG_DLM=m 391 315 CONFIG_MAGIC_SYSRQ=y 392 - # CONFIG_RCU_CPU_STALL_DETECTOR is not set 393 - CONFIG_SYSCTL_SYSCALL_CHECK=y 316 + CONFIG_ASYNC_RAID6_TEST=m 317 + CONFIG_ENCRYPTED_KEYS=m 318 + CONFIG_CRYPTO_MANAGER=y 319 + CONFIG_CRYPTO_USER=m 394 320 CONFIG_CRYPTO_NULL=m 395 321 CONFIG_CRYPTO_CRYPTD=m 396 322 CONFIG_CRYPTO_TEST=m ··· 413 313 CONFIG_CRYPTO_LRW=m 414 314 CONFIG_CRYPTO_PCBC=m 415 315 CONFIG_CRYPTO_XTS=m 416 - CONFIG_CRYPTO_HMAC=y 417 316 CONFIG_CRYPTO_XCBC=m 418 - CONFIG_CRYPTO_MD4=m 317 + CONFIG_CRYPTO_VMAC=m 419 318 CONFIG_CRYPTO_MICHAEL_MIC=m 420 319 CONFIG_CRYPTO_RMD128=m 421 320 CONFIG_CRYPTO_RMD160=m 422 321 CONFIG_CRYPTO_RMD256=m 423 322 CONFIG_CRYPTO_RMD320=m 424 - CONFIG_CRYPTO_SHA256=m 425 323 CONFIG_CRYPTO_SHA512=m 426 324 CONFIG_CRYPTO_TGR192=m 427 325 CONFIG_CRYPTO_WP512=m 428 - CONFIG_CRYPTO_AES=m 429 326 CONFIG_CRYPTO_ANUBIS=m 430 327 CONFIG_CRYPTO_BLOWFISH=m 431 328 CONFIG_CRYPTO_CAMELLIA=m ··· 438 341 CONFIG_CRYPTO_ZLIB=m 439 342 CONFIG_CRYPTO_LZO=m 440 343 # CONFIG_CRYPTO_ANSI_CPRNG is not set 344 + CONFIG_CRYPTO_USER_API_HASH=m 345 + CONFIG_CRYPTO_USER_API_SKCIPHER=m 441 346 # CONFIG_CRYPTO_HW is not set 442 - CONFIG_CRC16=m 443 347 CONFIG_CRC_T10DIF=y 348 + CONFIG_XZ_DEC_X86=y 349 + CONFIG_XZ_DEC_POWERPC=y 350 + CONFIG_XZ_DEC_IA64=y 351 + CONFIG_XZ_DEC_ARM=y 352 + CONFIG_XZ_DEC_ARMTHUMB=y 353 + CONFIG_XZ_DEC_SPARC=y 354 + CONFIG_XZ_DEC_TEST=m
+169 -58
arch/m68k/configs/atari_defconfig
··· 1 - CONFIG_EXPERIMENTAL=y 2 1 CONFIG_LOCALVERSION="-atari" 3 2 CONFIG_SYSVIPC=y 4 3 CONFIG_POSIX_MQUEUE=y 4 + CONFIG_FHANDLE=y 5 5 CONFIG_BSD_PROCESS_ACCT=y 6 - CONFIG_LOG_BUF_SHIFT=14 7 - CONFIG_RELAY=y 6 + CONFIG_BSD_PROCESS_ACCT_V3=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 12 CONFIG_BLK_DEV_INITRD=y 9 - # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 10 13 CONFIG_SLAB=y 11 14 CONFIG_MODULES=y 12 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 27 CONFIG_M68020=y 15 28 CONFIG_M68030=y 16 29 CONFIG_M68040=y 17 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 35 CONFIG_BINFMT_AOUT=m 19 36 CONFIG_BINFMT_MISC=m 20 - CONFIG_STRAM_PROC=y 21 - CONFIG_HEARTBEAT=y 22 - CONFIG_PROC_HARDWARE=y 23 37 CONFIG_NET=y 24 38 CONFIG_PACKET=y 39 + CONFIG_PACKET_DIAG=m 25 40 CONFIG_UNIX=y 41 + CONFIG_UNIX_DIAG=m 42 + CONFIG_XFRM_MIGRATE=y 26 43 CONFIG_NET_KEY=y 27 - CONFIG_NET_KEY_MIGRATE=y 28 44 CONFIG_INET=y 29 45 CONFIG_IP_PNP=y 46 + CONFIG_IP_PNP_DHCP=y 47 + CONFIG_IP_PNP_BOOTP=y 48 + CONFIG_IP_PNP_RARP=y 30 49 CONFIG_NET_IPIP=m 50 + CONFIG_NET_IPGRE_DEMUX=m 31 51 CONFIG_NET_IPGRE=m 32 52 CONFIG_SYN_COOKIES=y 53 + CONFIG_NET_IPVTI=m 33 54 CONFIG_INET_AH=m 34 55 CONFIG_INET_ESP=m 35 56 CONFIG_INET_IPCOMP=m 36 57 CONFIG_INET_XFRM_MODE_TRANSPORT=m 37 58 CONFIG_INET_XFRM_MODE_TUNNEL=m 38 59 CONFIG_INET_XFRM_MODE_BEET=m 60 + # CONFIG_INET_LRO is not set 39 61 CONFIG_INET_DIAG=m 62 + CONFIG_INET_UDP_DIAG=m 40 63 CONFIG_IPV6_PRIVACY=y 41 64 CONFIG_IPV6_ROUTER_PREF=y 42 - CONFIG_IPV6_ROUTE_INFO=y 43 65 CONFIG_INET6_AH=m 44 66 CONFIG_INET6_ESP=m 45 67 CONFIG_INET6_IPCOMP=m 46 - CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 47 - CONFIG_IPV6_TUNNEL=m 68 + CONFIG_IPV6_GRE=m 48 69 CONFIG_NETFILTER=y 49 - CONFIG_NETFILTER_NETLINK_QUEUE=m 50 70 CONFIG_NF_CONNTRACK=m 71 + CONFIG_NF_CONNTRACK_ZONES=y 72 + # CONFIG_NF_CONNTRACK_PROCFS is not set 51 73 # CONFIG_NF_CT_PROTO_DCCP is not set 52 74 CONFIG_NF_CT_PROTO_UDPLITE=m 53 75 CONFIG_NF_CONNTRACK_AMANDA=m ··· 77 55 CONFIG_NF_CONNTRACK_H323=m 78 56 CONFIG_NF_CONNTRACK_IRC=m 79 57 CONFIG_NF_CONNTRACK_NETBIOS_NS=m 58 + CONFIG_NF_CONNTRACK_SNMP=m 80 59 CONFIG_NF_CONNTRACK_PPTP=m 81 60 CONFIG_NF_CONNTRACK_SANE=m 82 61 CONFIG_NF_CONNTRACK_SIP=m 83 62 CONFIG_NF_CONNTRACK_TFTP=m 63 + CONFIG_NETFILTER_XT_SET=m 64 + CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 84 65 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 85 66 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 86 67 CONFIG_NETFILTER_XT_TARGET_DSCP=m 68 + CONFIG_NETFILTER_XT_TARGET_HMARK=m 69 + CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m 70 + CONFIG_NETFILTER_XT_TARGET_LOG=m 87 71 CONFIG_NETFILTER_XT_TARGET_MARK=m 88 72 CONFIG_NETFILTER_XT_TARGET_NFLOG=m 89 73 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 74 + CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 75 + CONFIG_NETFILTER_XT_TARGET_TEE=m 90 76 CONFIG_NETFILTER_XT_TARGET_TRACE=m 91 77 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 92 78 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 79 + CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m 80 + CONFIG_NETFILTER_XT_MATCH_BPF=m 93 81 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m 94 82 CONFIG_NETFILTER_XT_MATCH_COMMENT=m 95 83 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 84 + CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m 96 85 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 97 86 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 98 87 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 88 + CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m 99 89 CONFIG_NETFILTER_XT_MATCH_DSCP=m 100 90 CONFIG_NETFILTER_XT_MATCH_ESP=m 101 91 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m ··· 118 84 CONFIG_NETFILTER_XT_MATCH_MAC=m 119 85 CONFIG_NETFILTER_XT_MATCH_MARK=m 120 86 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 87 + CONFIG_NETFILTER_XT_MATCH_NFACCT=m 88 + CONFIG_NETFILTER_XT_MATCH_OSF=m 121 89 CONFIG_NETFILTER_XT_MATCH_OWNER=m 122 90 CONFIG_NETFILTER_XT_MATCH_POLICY=m 123 91 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m ··· 133 97 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 134 98 CONFIG_NETFILTER_XT_MATCH_TIME=m 135 99 CONFIG_NETFILTER_XT_MATCH_U32=m 100 + CONFIG_IP_SET=m 101 + CONFIG_IP_SET_BITMAP_IP=m 102 + CONFIG_IP_SET_BITMAP_IPMAC=m 103 + CONFIG_IP_SET_BITMAP_PORT=m 104 + CONFIG_IP_SET_HASH_IP=m 105 + CONFIG_IP_SET_HASH_IPPORT=m 106 + CONFIG_IP_SET_HASH_IPPORTIP=m 107 + CONFIG_IP_SET_HASH_IPPORTNET=m 108 + CONFIG_IP_SET_HASH_NET=m 109 + CONFIG_IP_SET_HASH_NETPORT=m 110 + CONFIG_IP_SET_HASH_NETIFACE=m 111 + CONFIG_IP_SET_LIST_SET=m 136 112 CONFIG_NF_CONNTRACK_IPV4=m 137 - CONFIG_IP_NF_QUEUE=m 138 113 CONFIG_IP_NF_IPTABLES=m 139 - CONFIG_IP_NF_MATCH_ADDRTYPE=m 140 114 CONFIG_IP_NF_MATCH_AH=m 141 115 CONFIG_IP_NF_MATCH_ECN=m 116 + CONFIG_IP_NF_MATCH_RPFILTER=m 142 117 CONFIG_IP_NF_MATCH_TTL=m 143 118 CONFIG_IP_NF_FILTER=m 144 119 CONFIG_IP_NF_TARGET_REJECT=m 145 - CONFIG_IP_NF_TARGET_LOG=m 146 120 CONFIG_IP_NF_TARGET_ULOG=m 147 - CONFIG_NF_NAT=m 121 + CONFIG_NF_NAT_IPV4=m 148 122 CONFIG_IP_NF_TARGET_MASQUERADE=m 149 123 CONFIG_IP_NF_TARGET_NETMAP=m 150 124 CONFIG_IP_NF_TARGET_REDIRECT=m 151 - CONFIG_NF_NAT_SNMP_BASIC=m 152 125 CONFIG_IP_NF_MANGLE=m 153 126 CONFIG_IP_NF_TARGET_CLUSTERIP=m 154 127 CONFIG_IP_NF_TARGET_ECN=m ··· 167 122 CONFIG_IP_NF_ARPFILTER=m 168 123 CONFIG_IP_NF_ARP_MANGLE=m 169 124 CONFIG_NF_CONNTRACK_IPV6=m 170 - CONFIG_IP6_NF_QUEUE=m 171 125 CONFIG_IP6_NF_IPTABLES=m 172 126 CONFIG_IP6_NF_MATCH_AH=m 173 127 CONFIG_IP6_NF_MATCH_EUI64=m ··· 175 131 CONFIG_IP6_NF_MATCH_HL=m 176 132 CONFIG_IP6_NF_MATCH_IPV6HEADER=m 177 133 CONFIG_IP6_NF_MATCH_MH=m 134 + CONFIG_IP6_NF_MATCH_RPFILTER=m 178 135 CONFIG_IP6_NF_MATCH_RT=m 179 136 CONFIG_IP6_NF_TARGET_HL=m 180 - CONFIG_IP6_NF_TARGET_LOG=m 181 137 CONFIG_IP6_NF_FILTER=m 182 138 CONFIG_IP6_NF_TARGET_REJECT=m 183 139 CONFIG_IP6_NF_MANGLE=m 184 140 CONFIG_IP6_NF_RAW=m 141 + CONFIG_NF_NAT_IPV6=m 142 + CONFIG_IP6_NF_TARGET_MASQUERADE=m 143 + CONFIG_IP6_NF_TARGET_NPT=m 185 144 CONFIG_IP_DCCP=m 186 145 # CONFIG_IP_DCCP_CCID3 is not set 146 + CONFIG_SCTP_COOKIE_HMAC_SHA1=y 147 + CONFIG_RDS=m 148 + CONFIG_RDS_TCP=m 149 + CONFIG_L2TP=m 187 150 CONFIG_ATALK=m 151 + CONFIG_BATMAN_ADV=m 152 + CONFIG_BATMAN_ADV_DAT=y 153 + # CONFIG_WIRELESS is not set 188 154 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 155 + CONFIG_DEVTMPFS=y 189 156 # CONFIG_FIRMWARE_IN_KERNEL is not set 157 + # CONFIG_FW_LOADER_USER_HELPER is not set 190 158 CONFIG_CONNECTOR=m 191 159 CONFIG_PARPORT=m 192 160 CONFIG_PARPORT_ATARI=m ··· 206 150 CONFIG_ATARI_FLOPPY=y 207 151 CONFIG_BLK_DEV_LOOP=y 208 152 CONFIG_BLK_DEV_CRYPTOLOOP=m 153 + CONFIG_BLK_DEV_DRBD=m 209 154 CONFIG_BLK_DEV_NBD=m 210 155 CONFIG_BLK_DEV_RAM=y 211 156 CONFIG_CDROM_PKTCDVD=m 212 157 CONFIG_ATA_OVER_ETH=m 213 158 CONFIG_IDE=y 159 + CONFIG_IDE_GD_ATAPI=y 214 160 CONFIG_BLK_DEV_IDECD=y 215 161 CONFIG_BLK_DEV_FALCON_IDE=y 216 162 CONFIG_RAID_ATTRS=m ··· 225 167 CONFIG_BLK_DEV_SR_VENDOR=y 226 168 CONFIG_CHR_DEV_SG=m 227 169 CONFIG_SCSI_CONSTANTS=y 228 - CONFIG_SCSI_SAS_LIBSAS=m 229 - # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set 230 - CONFIG_SCSI_SRP_ATTRS=m 231 - CONFIG_SCSI_SRP_TGT_ATTRS=y 170 + CONFIG_SCSI_SAS_ATTRS=m 232 171 CONFIG_ISCSI_TCP=m 172 + CONFIG_ISCSI_BOOT_SYSFS=m 233 173 CONFIG_ATARI_SCSI=y 234 174 CONFIG_MD=y 235 - CONFIG_BLK_DEV_MD=m 236 175 CONFIG_MD_LINEAR=m 237 176 CONFIG_MD_RAID0=m 238 - CONFIG_MD_RAID1=m 239 - CONFIG_MD_RAID456=m 240 177 CONFIG_BLK_DEV_DM=m 241 178 CONFIG_DM_CRYPT=m 242 179 CONFIG_DM_SNAPSHOT=m 180 + CONFIG_DM_THIN_PROVISIONING=m 181 + CONFIG_DM_CACHE=m 243 182 CONFIG_DM_MIRROR=m 183 + CONFIG_DM_RAID=m 244 184 CONFIG_DM_ZERO=m 245 185 CONFIG_DM_MULTIPATH=m 246 186 CONFIG_DM_UEVENT=y 187 + CONFIG_TARGET_CORE=m 188 + CONFIG_TCM_IBLOCK=m 189 + CONFIG_TCM_FILEIO=m 190 + CONFIG_TCM_PSCSI=m 247 191 CONFIG_NETDEVICES=y 248 192 CONFIG_DUMMY=m 249 - CONFIG_MACVLAN=m 250 193 CONFIG_EQUALIZER=m 251 - CONFIG_VETH=m 252 - CONFIG_NET_ETHERNET=y 253 194 CONFIG_MII=y 195 + CONFIG_NET_TEAM=m 196 + CONFIG_NET_TEAM_MODE_BROADCAST=m 197 + CONFIG_NET_TEAM_MODE_ROUNDROBIN=m 198 + CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 199 + CONFIG_NET_TEAM_MODE_LOADBALANCE=m 200 + CONFIG_VXLAN=m 201 + CONFIG_NETCONSOLE=m 202 + CONFIG_NETCONSOLE_DYNAMIC=y 203 + CONFIG_VETH=m 254 204 CONFIG_ATARILANCE=y 255 - # CONFIG_NETDEV_1000 is not set 256 - # CONFIG_NETDEV_10000 is not set 205 + # CONFIG_NET_CADENCE is not set 206 + # CONFIG_NET_VENDOR_BROADCOM is not set 207 + # CONFIG_NET_VENDOR_INTEL is not set 208 + # CONFIG_NET_VENDOR_MARVELL is not set 209 + # CONFIG_NET_VENDOR_MICREL is not set 210 + # CONFIG_NET_VENDOR_SEEQ is not set 211 + # CONFIG_NET_VENDOR_STMICRO is not set 212 + # CONFIG_NET_VENDOR_WIZNET is not set 257 213 CONFIG_PPP=m 258 - CONFIG_PPP_FILTER=y 259 - CONFIG_PPP_ASYNC=m 260 - CONFIG_PPP_SYNC_TTY=m 261 - CONFIG_PPP_DEFLATE=m 262 214 CONFIG_PPP_BSDCOMP=m 215 + CONFIG_PPP_DEFLATE=m 216 + CONFIG_PPP_FILTER=y 263 217 CONFIG_PPP_MPPE=m 264 218 CONFIG_PPPOE=m 219 + CONFIG_PPTP=m 220 + CONFIG_PPPOL2TP=m 221 + CONFIG_PPP_ASYNC=m 222 + CONFIG_PPP_SYNC_TTY=m 265 223 CONFIG_SLIP=m 266 224 CONFIG_SLIP_COMPRESSED=y 267 225 CONFIG_SLIP_SMART=y 268 226 CONFIG_SLIP_MODE_SLIP6=y 269 - CONFIG_NETCONSOLE=m 270 - CONFIG_NETCONSOLE_DYNAMIC=y 271 - CONFIG_INPUT_FF_MEMLESS=m 227 + # CONFIG_WLAN is not set 228 + CONFIG_INPUT_EVDEV=m 272 229 CONFIG_KEYBOARD_ATARI=y 273 230 # CONFIG_KEYBOARD_ATKBD is not set 274 - CONFIG_MOUSE_PS2=m 231 + # CONFIG_MOUSE_PS2 is not set 275 232 CONFIG_MOUSE_ATARI=m 276 233 CONFIG_INPUT_MISC=y 277 234 CONFIG_INPUT_M68K_BEEP=m 278 - # CONFIG_SERIO_SERPORT is not set 235 + # CONFIG_SERIO is not set 279 236 CONFIG_VT_HW_CONSOLE_BINDING=y 237 + # CONFIG_LEGACY_PTYS is not set 280 238 # CONFIG_DEVKMEM is not set 281 239 CONFIG_PRINTER=m 282 240 # CONFIG_HW_RANDOM is not set 283 - CONFIG_GEN_RTC=m 284 - CONFIG_GEN_RTC_X=y 241 + CONFIG_NTP_PPS=y 242 + CONFIG_PPS_CLIENT_LDISC=m 243 + CONFIG_PPS_CLIENT_PARPORT=m 244 + CONFIG_PTP_1588_CLOCK=m 285 245 # CONFIG_HWMON is not set 286 246 CONFIG_FB=y 287 247 CONFIG_FB_ATARI=y ··· 309 233 CONFIG_DMASOUND_ATARI=m 310 234 CONFIG_HID=m 311 235 CONFIG_HIDRAW=y 312 - # CONFIG_USB_SUPPORT is not set 236 + CONFIG_UHID=m 237 + CONFIG_RTC_CLASS=y 238 + CONFIG_RTC_DRV_GENERIC=m 239 + # CONFIG_IOMMU_SUPPORT is not set 240 + CONFIG_HEARTBEAT=y 241 + CONFIG_PROC_HARDWARE=y 242 + CONFIG_NATFEAT=y 243 + CONFIG_NFBLOCK=y 244 + CONFIG_NFCON=y 245 + CONFIG_NFETH=y 313 246 CONFIG_ATARI_DSP56K=m 314 247 CONFIG_EXT2_FS=y 315 248 CONFIG_EXT3_FS=y 316 249 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 317 250 # CONFIG_EXT3_FS_XATTR is not set 251 + CONFIG_EXT4_FS=y 318 252 CONFIG_REISERFS_FS=m 319 253 CONFIG_JFS_FS=m 320 254 CONFIG_XFS_FS=m 321 255 CONFIG_OCFS2_FS=m 322 - # CONFIG_OCFS2_FS_STATS is not set 323 256 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 257 + CONFIG_FANOTIFY=y 324 258 CONFIG_QUOTA_NETLINK_INTERFACE=y 325 259 # CONFIG_PRINT_QUOTA_WARNING is not set 326 - CONFIG_AUTOFS_FS=m 327 260 CONFIG_AUTOFS4_FS=m 328 261 CONFIG_FUSE_FS=m 262 + CONFIG_CUSE=m 329 263 CONFIG_ISO9660_FS=y 330 264 CONFIG_JOLIET=y 331 265 CONFIG_ZISOFS=y 332 266 CONFIG_UDF_FS=m 333 - CONFIG_MSDOS_FS=y 267 + CONFIG_MSDOS_FS=m 334 268 CONFIG_VFAT_FS=m 335 269 CONFIG_PROC_KCORE=y 336 270 CONFIG_TMPFS=y 337 271 CONFIG_AFFS_FS=m 272 + CONFIG_ECRYPT_FS=m 273 + CONFIG_ECRYPT_FS_MESSAGING=y 338 274 CONFIG_HFS_FS=m 339 275 CONFIG_HFSPLUS_FS=m 340 276 CONFIG_CRAMFS=m 341 277 CONFIG_SQUASHFS=m 342 - CONFIG_MINIX_FS=y 278 + CONFIG_SQUASHFS_LZO=y 279 + CONFIG_MINIX_FS=m 280 + CONFIG_OMFS_FS=m 343 281 CONFIG_HPFS_FS=m 282 + CONFIG_QNX4FS_FS=m 283 + CONFIG_QNX6FS_FS=m 344 284 CONFIG_SYSV_FS=m 345 285 CONFIG_UFS_FS=m 346 286 CONFIG_NFS_FS=y 347 - CONFIG_NFS_V3=y 348 287 CONFIG_NFS_V4=y 288 + CONFIG_NFS_SWAP=y 289 + CONFIG_ROOT_NFS=y 349 290 CONFIG_NFSD=m 350 291 CONFIG_NFSD_V3=y 351 - CONFIG_SMB_FS=m 352 - CONFIG_SMB_NLS_DEFAULT=y 292 + CONFIG_CIFS=m 293 + # CONFIG_CIFS_DEBUG is not set 353 294 CONFIG_CODA_FS=m 354 295 CONFIG_NLS_CODEPAGE_437=y 355 296 CONFIG_NLS_CODEPAGE_737=m ··· 405 312 CONFIG_NLS_ISO8859_15=m 406 313 CONFIG_NLS_KOI8_R=m 407 314 CONFIG_NLS_KOI8_U=m 315 + CONFIG_NLS_MAC_ROMAN=m 316 + CONFIG_NLS_MAC_CELTIC=m 317 + CONFIG_NLS_MAC_CENTEURO=m 318 + CONFIG_NLS_MAC_CROATIAN=m 319 + CONFIG_NLS_MAC_CYRILLIC=m 320 + CONFIG_NLS_MAC_GAELIC=m 321 + CONFIG_NLS_MAC_GREEK=m 322 + CONFIG_NLS_MAC_ICELAND=m 323 + CONFIG_NLS_MAC_INUIT=m 324 + CONFIG_NLS_MAC_ROMANIAN=m 325 + CONFIG_NLS_MAC_TURKISH=m 408 326 CONFIG_DLM=m 409 327 CONFIG_MAGIC_SYSRQ=y 410 - # CONFIG_RCU_CPU_STALL_DETECTOR is not set 411 - CONFIG_SYSCTL_SYSCALL_CHECK=y 328 + CONFIG_ASYNC_RAID6_TEST=m 329 + CONFIG_ENCRYPTED_KEYS=m 330 + CONFIG_CRYPTO_MANAGER=y 331 + CONFIG_CRYPTO_USER=m 412 332 CONFIG_CRYPTO_NULL=m 413 333 CONFIG_CRYPTO_CRYPTD=m 414 334 CONFIG_CRYPTO_TEST=m ··· 431 325 CONFIG_CRYPTO_LRW=m 432 326 CONFIG_CRYPTO_PCBC=m 433 327 CONFIG_CRYPTO_XTS=m 434 - CONFIG_CRYPTO_HMAC=y 435 328 CONFIG_CRYPTO_XCBC=m 436 - CONFIG_CRYPTO_MD4=m 329 + CONFIG_CRYPTO_VMAC=m 437 330 CONFIG_CRYPTO_MICHAEL_MIC=m 438 331 CONFIG_CRYPTO_RMD128=m 439 332 CONFIG_CRYPTO_RMD160=m 440 333 CONFIG_CRYPTO_RMD256=m 441 334 CONFIG_CRYPTO_RMD320=m 442 - CONFIG_CRYPTO_SHA256=m 443 335 CONFIG_CRYPTO_SHA512=m 444 336 CONFIG_CRYPTO_TGR192=m 445 337 CONFIG_CRYPTO_WP512=m 446 - CONFIG_CRYPTO_AES=m 447 338 CONFIG_CRYPTO_ANUBIS=m 448 339 CONFIG_CRYPTO_BLOWFISH=m 449 340 CONFIG_CRYPTO_CAMELLIA=m ··· 456 353 CONFIG_CRYPTO_ZLIB=m 457 354 CONFIG_CRYPTO_LZO=m 458 355 # CONFIG_CRYPTO_ANSI_CPRNG is not set 356 + CONFIG_CRYPTO_USER_API_HASH=m 357 + CONFIG_CRYPTO_USER_API_SKCIPHER=m 459 358 # CONFIG_CRYPTO_HW is not set 460 - CONFIG_CRC16=y 461 359 CONFIG_CRC_T10DIF=y 360 + CONFIG_XZ_DEC_X86=y 361 + CONFIG_XZ_DEC_POWERPC=y 362 + CONFIG_XZ_DEC_IA64=y 363 + CONFIG_XZ_DEC_ARM=y 364 + CONFIG_XZ_DEC_ARMTHUMB=y 365 + CONFIG_XZ_DEC_SPARC=y 366 + CONFIG_XZ_DEC_TEST=m
+159 -58
arch/m68k/configs/bvme6000_defconfig
··· 1 - CONFIG_EXPERIMENTAL=y 2 1 CONFIG_LOCALVERSION="-bvme6000" 3 2 CONFIG_SYSVIPC=y 4 3 CONFIG_POSIX_MQUEUE=y 4 + CONFIG_FHANDLE=y 5 5 CONFIG_BSD_PROCESS_ACCT=y 6 - CONFIG_LOG_BUF_SHIFT=14 7 - CONFIG_RELAY=y 6 + CONFIG_BSD_PROCESS_ACCT_V3=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 12 CONFIG_BLK_DEV_INITRD=y 9 - # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 10 13 CONFIG_SLAB=y 11 14 CONFIG_MODULES=y 12 15 CONFIG_MODULE_UNLOAD=y 13 - CONFIG_VME=y 14 - CONFIG_BVME6000=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 15 27 CONFIG_M68040=y 16 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 34 CONFIG_BINFMT_AOUT=m 18 35 CONFIG_BINFMT_MISC=m 19 - CONFIG_PROC_HARDWARE=y 20 36 CONFIG_NET=y 21 37 CONFIG_PACKET=y 38 + CONFIG_PACKET_DIAG=m 22 39 CONFIG_UNIX=y 40 + CONFIG_UNIX_DIAG=m 41 + CONFIG_XFRM_MIGRATE=y 23 42 CONFIG_NET_KEY=y 24 - CONFIG_NET_KEY_MIGRATE=y 25 43 CONFIG_INET=y 26 44 CONFIG_IP_PNP=y 27 45 CONFIG_IP_PNP_DHCP=y 28 46 CONFIG_IP_PNP_BOOTP=y 29 47 CONFIG_IP_PNP_RARP=y 30 48 CONFIG_NET_IPIP=m 49 + CONFIG_NET_IPGRE_DEMUX=m 31 50 CONFIG_NET_IPGRE=m 32 51 CONFIG_SYN_COOKIES=y 52 + CONFIG_NET_IPVTI=m 33 53 CONFIG_INET_AH=m 34 54 CONFIG_INET_ESP=m 35 55 CONFIG_INET_IPCOMP=m 36 56 CONFIG_INET_XFRM_MODE_TRANSPORT=m 37 57 CONFIG_INET_XFRM_MODE_TUNNEL=m 38 58 CONFIG_INET_XFRM_MODE_BEET=m 59 + # CONFIG_INET_LRO is not set 39 60 CONFIG_INET_DIAG=m 61 + CONFIG_INET_UDP_DIAG=m 40 62 CONFIG_IPV6_PRIVACY=y 41 63 CONFIG_IPV6_ROUTER_PREF=y 42 - CONFIG_IPV6_ROUTE_INFO=y 43 64 CONFIG_INET6_AH=m 44 65 CONFIG_INET6_ESP=m 45 66 CONFIG_INET6_IPCOMP=m 46 - CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 47 - CONFIG_IPV6_TUNNEL=m 67 + CONFIG_IPV6_GRE=m 48 68 CONFIG_NETFILTER=y 49 - CONFIG_NETFILTER_NETLINK_QUEUE=m 50 69 CONFIG_NF_CONNTRACK=m 70 + CONFIG_NF_CONNTRACK_ZONES=y 71 + # CONFIG_NF_CONNTRACK_PROCFS is not set 51 72 # CONFIG_NF_CT_PROTO_DCCP is not set 52 73 CONFIG_NF_CT_PROTO_UDPLITE=m 53 74 CONFIG_NF_CONNTRACK_AMANDA=m ··· 76 55 CONFIG_NF_CONNTRACK_H323=m 77 56 CONFIG_NF_CONNTRACK_IRC=m 78 57 CONFIG_NF_CONNTRACK_NETBIOS_NS=m 58 + CONFIG_NF_CONNTRACK_SNMP=m 79 59 CONFIG_NF_CONNTRACK_PPTP=m 80 60 CONFIG_NF_CONNTRACK_SANE=m 81 61 CONFIG_NF_CONNTRACK_SIP=m 82 62 CONFIG_NF_CONNTRACK_TFTP=m 63 + CONFIG_NETFILTER_XT_SET=m 64 + CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 83 65 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 84 66 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 85 67 CONFIG_NETFILTER_XT_TARGET_DSCP=m 68 + CONFIG_NETFILTER_XT_TARGET_HMARK=m 69 + CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m 70 + CONFIG_NETFILTER_XT_TARGET_LOG=m 86 71 CONFIG_NETFILTER_XT_TARGET_MARK=m 87 72 CONFIG_NETFILTER_XT_TARGET_NFLOG=m 88 73 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 74 + CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 75 + CONFIG_NETFILTER_XT_TARGET_TEE=m 89 76 CONFIG_NETFILTER_XT_TARGET_TRACE=m 90 77 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 91 78 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 79 + CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m 80 + CONFIG_NETFILTER_XT_MATCH_BPF=m 92 81 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m 93 82 CONFIG_NETFILTER_XT_MATCH_COMMENT=m 94 83 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 84 + CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m 95 85 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 96 86 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 97 87 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 88 + CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m 98 89 CONFIG_NETFILTER_XT_MATCH_DSCP=m 99 90 CONFIG_NETFILTER_XT_MATCH_ESP=m 100 91 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m ··· 117 84 CONFIG_NETFILTER_XT_MATCH_MAC=m 118 85 CONFIG_NETFILTER_XT_MATCH_MARK=m 119 86 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 87 + CONFIG_NETFILTER_XT_MATCH_NFACCT=m 88 + CONFIG_NETFILTER_XT_MATCH_OSF=m 120 89 CONFIG_NETFILTER_XT_MATCH_OWNER=m 121 90 CONFIG_NETFILTER_XT_MATCH_POLICY=m 122 91 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m ··· 132 97 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 133 98 CONFIG_NETFILTER_XT_MATCH_TIME=m 134 99 CONFIG_NETFILTER_XT_MATCH_U32=m 100 + CONFIG_IP_SET=m 101 + CONFIG_IP_SET_BITMAP_IP=m 102 + CONFIG_IP_SET_BITMAP_IPMAC=m 103 + CONFIG_IP_SET_BITMAP_PORT=m 104 + CONFIG_IP_SET_HASH_IP=m 105 + CONFIG_IP_SET_HASH_IPPORT=m 106 + CONFIG_IP_SET_HASH_IPPORTIP=m 107 + CONFIG_IP_SET_HASH_IPPORTNET=m 108 + CONFIG_IP_SET_HASH_NET=m 109 + CONFIG_IP_SET_HASH_NETPORT=m 110 + CONFIG_IP_SET_HASH_NETIFACE=m 111 + CONFIG_IP_SET_LIST_SET=m 135 112 CONFIG_NF_CONNTRACK_IPV4=m 136 - CONFIG_IP_NF_QUEUE=m 137 113 CONFIG_IP_NF_IPTABLES=m 138 - CONFIG_IP_NF_MATCH_ADDRTYPE=m 139 114 CONFIG_IP_NF_MATCH_AH=m 140 115 CONFIG_IP_NF_MATCH_ECN=m 116 + CONFIG_IP_NF_MATCH_RPFILTER=m 141 117 CONFIG_IP_NF_MATCH_TTL=m 142 118 CONFIG_IP_NF_FILTER=m 143 119 CONFIG_IP_NF_TARGET_REJECT=m 144 - CONFIG_IP_NF_TARGET_LOG=m 145 120 CONFIG_IP_NF_TARGET_ULOG=m 146 - CONFIG_NF_NAT=m 121 + CONFIG_NF_NAT_IPV4=m 147 122 CONFIG_IP_NF_TARGET_MASQUERADE=m 148 123 CONFIG_IP_NF_TARGET_NETMAP=m 149 124 CONFIG_IP_NF_TARGET_REDIRECT=m 150 - CONFIG_NF_NAT_SNMP_BASIC=m 151 125 CONFIG_IP_NF_MANGLE=m 152 126 CONFIG_IP_NF_TARGET_CLUSTERIP=m 153 127 CONFIG_IP_NF_TARGET_ECN=m ··· 166 122 CONFIG_IP_NF_ARPFILTER=m 167 123 CONFIG_IP_NF_ARP_MANGLE=m 168 124 CONFIG_NF_CONNTRACK_IPV6=m 169 - CONFIG_IP6_NF_QUEUE=m 170 125 CONFIG_IP6_NF_IPTABLES=m 171 126 CONFIG_IP6_NF_MATCH_AH=m 172 127 CONFIG_IP6_NF_MATCH_EUI64=m ··· 174 131 CONFIG_IP6_NF_MATCH_HL=m 175 132 CONFIG_IP6_NF_MATCH_IPV6HEADER=m 176 133 CONFIG_IP6_NF_MATCH_MH=m 134 + CONFIG_IP6_NF_MATCH_RPFILTER=m 177 135 CONFIG_IP6_NF_MATCH_RT=m 178 136 CONFIG_IP6_NF_TARGET_HL=m 179 - CONFIG_IP6_NF_TARGET_LOG=m 180 137 CONFIG_IP6_NF_FILTER=m 181 138 CONFIG_IP6_NF_TARGET_REJECT=m 182 139 CONFIG_IP6_NF_MANGLE=m 183 140 CONFIG_IP6_NF_RAW=m 141 + CONFIG_NF_NAT_IPV6=m 142 + CONFIG_IP6_NF_TARGET_MASQUERADE=m 143 + CONFIG_IP6_NF_TARGET_NPT=m 184 144 CONFIG_IP_DCCP=m 185 145 # CONFIG_IP_DCCP_CCID3 is not set 146 + CONFIG_SCTP_COOKIE_HMAC_SHA1=y 147 + CONFIG_RDS=m 148 + CONFIG_RDS_TCP=m 149 + CONFIG_L2TP=m 186 150 CONFIG_ATALK=m 151 + CONFIG_BATMAN_ADV=m 152 + CONFIG_BATMAN_ADV_DAT=y 153 + # CONFIG_WIRELESS is not set 187 154 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 155 + CONFIG_DEVTMPFS=y 188 156 # CONFIG_FIRMWARE_IN_KERNEL is not set 157 + # CONFIG_FW_LOADER_USER_HELPER is not set 189 158 CONFIG_CONNECTOR=m 190 159 CONFIG_BLK_DEV_LOOP=y 191 160 CONFIG_BLK_DEV_CRYPTOLOOP=m 161 + CONFIG_BLK_DEV_DRBD=m 192 162 CONFIG_BLK_DEV_NBD=m 193 163 CONFIG_BLK_DEV_RAM=y 194 164 CONFIG_CDROM_PKTCDVD=m ··· 216 160 CONFIG_BLK_DEV_SR_VENDOR=y 217 161 CONFIG_CHR_DEV_SG=m 218 162 CONFIG_SCSI_CONSTANTS=y 219 - CONFIG_SCSI_SAS_LIBSAS=m 220 - # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set 221 - CONFIG_SCSI_SRP_ATTRS=m 222 - CONFIG_SCSI_SRP_TGT_ATTRS=y 163 + CONFIG_SCSI_SAS_ATTRS=m 223 164 CONFIG_ISCSI_TCP=m 165 + CONFIG_ISCSI_BOOT_SYSFS=m 224 166 CONFIG_BVME6000_SCSI=y 225 167 CONFIG_MD=y 226 - CONFIG_BLK_DEV_MD=m 227 168 CONFIG_MD_LINEAR=m 228 169 CONFIG_MD_RAID0=m 229 - CONFIG_MD_RAID1=m 230 - CONFIG_MD_RAID456=m 231 170 CONFIG_BLK_DEV_DM=m 232 171 CONFIG_DM_CRYPT=m 233 172 CONFIG_DM_SNAPSHOT=m 173 + CONFIG_DM_THIN_PROVISIONING=m 174 + CONFIG_DM_CACHE=m 234 175 CONFIG_DM_MIRROR=m 176 + CONFIG_DM_RAID=m 235 177 CONFIG_DM_ZERO=m 236 178 CONFIG_DM_MULTIPATH=m 237 179 CONFIG_DM_UEVENT=y 180 + CONFIG_TARGET_CORE=m 181 + CONFIG_TCM_IBLOCK=m 182 + CONFIG_TCM_FILEIO=m 183 + CONFIG_TCM_PSCSI=m 238 184 CONFIG_NETDEVICES=y 239 185 CONFIG_DUMMY=m 240 - CONFIG_MACVLAN=m 241 186 CONFIG_EQUALIZER=m 187 + CONFIG_NET_TEAM=m 188 + CONFIG_NET_TEAM_MODE_BROADCAST=m 189 + CONFIG_NET_TEAM_MODE_ROUNDROBIN=m 190 + CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 191 + CONFIG_NET_TEAM_MODE_LOADBALANCE=m 192 + CONFIG_VXLAN=m 193 + CONFIG_NETCONSOLE=m 194 + CONFIG_NETCONSOLE_DYNAMIC=y 242 195 CONFIG_VETH=m 243 - CONFIG_NET_ETHERNET=y 196 + # CONFIG_NET_CADENCE is not set 197 + # CONFIG_NET_VENDOR_BROADCOM is not set 244 198 CONFIG_BVME6000_NET=y 245 - # CONFIG_NETDEV_1000 is not set 246 - # CONFIG_NETDEV_10000 is not set 199 + # CONFIG_NET_VENDOR_MARVELL is not set 200 + # CONFIG_NET_VENDOR_MICREL is not set 201 + # CONFIG_NET_VENDOR_NATSEMI is not set 202 + # CONFIG_NET_VENDOR_SEEQ is not set 203 + # CONFIG_NET_VENDOR_STMICRO is not set 204 + # CONFIG_NET_VENDOR_WIZNET is not set 247 205 CONFIG_PPP=m 248 - CONFIG_PPP_FILTER=y 249 - CONFIG_PPP_ASYNC=m 250 - CONFIG_PPP_SYNC_TTY=m 251 - CONFIG_PPP_DEFLATE=m 252 206 CONFIG_PPP_BSDCOMP=m 207 + CONFIG_PPP_DEFLATE=m 208 + CONFIG_PPP_FILTER=y 253 209 CONFIG_PPP_MPPE=m 254 210 CONFIG_PPPOE=m 211 + CONFIG_PPTP=m 212 + CONFIG_PPPOL2TP=m 213 + CONFIG_PPP_ASYNC=m 214 + CONFIG_PPP_SYNC_TTY=m 255 215 CONFIG_SLIP=m 256 216 CONFIG_SLIP_COMPRESSED=y 257 217 CONFIG_SLIP_SMART=y 258 218 CONFIG_SLIP_MODE_SLIP6=y 259 - CONFIG_NETCONSOLE=m 260 - CONFIG_NETCONSOLE_DYNAMIC=y 261 - CONFIG_INPUT_FF_MEMLESS=m 219 + # CONFIG_WLAN is not set 220 + CONFIG_INPUT_EVDEV=m 262 221 # CONFIG_KEYBOARD_ATKBD is not set 263 - CONFIG_MOUSE_PS2=m 264 - CONFIG_MOUSE_SERIAL=m 265 - CONFIG_SERIO=m 266 - # CONFIG_SERIO_SERPORT is not set 222 + # CONFIG_MOUSE_PS2 is not set 223 + # CONFIG_SERIO is not set 267 224 CONFIG_VT_HW_CONSOLE_BINDING=y 225 + # CONFIG_LEGACY_PTYS is not set 268 226 # CONFIG_DEVKMEM is not set 269 227 # CONFIG_HW_RANDOM is not set 270 - CONFIG_GEN_RTC=m 271 - CONFIG_GEN_RTC_X=y 228 + CONFIG_NTP_PPS=y 229 + CONFIG_PPS_CLIENT_LDISC=m 230 + CONFIG_PTP_1588_CLOCK=m 272 231 # CONFIG_HWMON is not set 273 232 CONFIG_HID=m 274 233 CONFIG_HIDRAW=y 234 + CONFIG_UHID=m 235 + # CONFIG_HID_GENERIC is not set 275 236 # CONFIG_USB_SUPPORT is not set 237 + CONFIG_RTC_CLASS=y 238 + CONFIG_RTC_DRV_GENERIC=m 239 + # CONFIG_IOMMU_SUPPORT is not set 240 + CONFIG_PROC_HARDWARE=y 276 241 CONFIG_EXT2_FS=y 277 242 CONFIG_EXT3_FS=y 278 243 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 279 244 # CONFIG_EXT3_FS_XATTR is not set 245 + CONFIG_EXT4_FS=y 280 246 CONFIG_REISERFS_FS=m 281 247 CONFIG_JFS_FS=m 282 248 CONFIG_XFS_FS=m 283 249 CONFIG_OCFS2_FS=m 284 - # CONFIG_OCFS2_FS_STATS is not set 285 250 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 251 + CONFIG_FANOTIFY=y 286 252 CONFIG_QUOTA_NETLINK_INTERFACE=y 287 253 # CONFIG_PRINT_QUOTA_WARNING is not set 288 - CONFIG_AUTOFS_FS=m 289 254 CONFIG_AUTOFS4_FS=m 290 255 CONFIG_FUSE_FS=m 256 + CONFIG_CUSE=m 291 257 CONFIG_ISO9660_FS=y 292 258 CONFIG_JOLIET=y 293 259 CONFIG_ZISOFS=y 294 260 CONFIG_UDF_FS=m 295 - CONFIG_MSDOS_FS=y 261 + CONFIG_MSDOS_FS=m 296 262 CONFIG_VFAT_FS=m 297 263 CONFIG_PROC_KCORE=y 298 264 CONFIG_TMPFS=y 299 265 CONFIG_AFFS_FS=m 266 + CONFIG_ECRYPT_FS=m 267 + CONFIG_ECRYPT_FS_MESSAGING=y 300 268 CONFIG_HFS_FS=m 301 269 CONFIG_HFSPLUS_FS=m 302 270 CONFIG_CRAMFS=m 303 271 CONFIG_SQUASHFS=m 304 - CONFIG_MINIX_FS=y 272 + CONFIG_SQUASHFS_LZO=y 273 + CONFIG_MINIX_FS=m 274 + CONFIG_OMFS_FS=m 305 275 CONFIG_HPFS_FS=m 276 + CONFIG_QNX4FS_FS=m 277 + CONFIG_QNX6FS_FS=m 306 278 CONFIG_SYSV_FS=m 307 279 CONFIG_UFS_FS=m 308 280 CONFIG_NFS_FS=y 309 - CONFIG_NFS_V3=y 310 281 CONFIG_NFS_V4=y 282 + CONFIG_NFS_SWAP=y 311 283 CONFIG_ROOT_NFS=y 312 284 CONFIG_NFSD=m 313 285 CONFIG_NFSD_V3=y 314 - CONFIG_SMB_FS=m 315 - CONFIG_SMB_NLS_DEFAULT=y 286 + CONFIG_CIFS=m 287 + # CONFIG_CIFS_DEBUG is not set 316 288 CONFIG_CODA_FS=m 317 289 CONFIG_NLS_CODEPAGE_437=y 318 290 CONFIG_NLS_CODEPAGE_737=m ··· 379 295 CONFIG_NLS_ISO8859_15=m 380 296 CONFIG_NLS_KOI8_R=m 381 297 CONFIG_NLS_KOI8_U=m 298 + CONFIG_NLS_MAC_ROMAN=m 299 + CONFIG_NLS_MAC_CELTIC=m 300 + CONFIG_NLS_MAC_CENTEURO=m 301 + CONFIG_NLS_MAC_CROATIAN=m 302 + CONFIG_NLS_MAC_CYRILLIC=m 303 + CONFIG_NLS_MAC_GAELIC=m 304 + CONFIG_NLS_MAC_GREEK=m 305 + CONFIG_NLS_MAC_ICELAND=m 306 + CONFIG_NLS_MAC_INUIT=m 307 + CONFIG_NLS_MAC_ROMANIAN=m 308 + CONFIG_NLS_MAC_TURKISH=m 382 309 CONFIG_DLM=m 383 310 CONFIG_MAGIC_SYSRQ=y 384 - # CONFIG_RCU_CPU_STALL_DETECTOR is not set 385 - CONFIG_SYSCTL_SYSCALL_CHECK=y 311 + CONFIG_ASYNC_RAID6_TEST=m 312 + CONFIG_ENCRYPTED_KEYS=m 313 + CONFIG_CRYPTO_MANAGER=y 314 + CONFIG_CRYPTO_USER=m 386 315 CONFIG_CRYPTO_NULL=m 387 316 CONFIG_CRYPTO_CRYPTD=m 388 317 CONFIG_CRYPTO_TEST=m ··· 405 308 CONFIG_CRYPTO_LRW=m 406 309 CONFIG_CRYPTO_PCBC=m 407 310 CONFIG_CRYPTO_XTS=m 408 - CONFIG_CRYPTO_HMAC=y 409 311 CONFIG_CRYPTO_XCBC=m 410 - CONFIG_CRYPTO_MD4=m 312 + CONFIG_CRYPTO_VMAC=m 411 313 CONFIG_CRYPTO_MICHAEL_MIC=m 412 314 CONFIG_CRYPTO_RMD128=m 413 315 CONFIG_CRYPTO_RMD160=m 414 316 CONFIG_CRYPTO_RMD256=m 415 317 CONFIG_CRYPTO_RMD320=m 416 - CONFIG_CRYPTO_SHA256=m 417 318 CONFIG_CRYPTO_SHA512=m 418 319 CONFIG_CRYPTO_TGR192=m 419 320 CONFIG_CRYPTO_WP512=m 420 - CONFIG_CRYPTO_AES=m 421 321 CONFIG_CRYPTO_ANUBIS=m 422 322 CONFIG_CRYPTO_BLOWFISH=m 423 323 CONFIG_CRYPTO_CAMELLIA=m ··· 430 336 CONFIG_CRYPTO_ZLIB=m 431 337 CONFIG_CRYPTO_LZO=m 432 338 # CONFIG_CRYPTO_ANSI_CPRNG is not set 339 + CONFIG_CRYPTO_USER_API_HASH=m 340 + CONFIG_CRYPTO_USER_API_SKCIPHER=m 433 341 # CONFIG_CRYPTO_HW is not set 434 - CONFIG_CRC16=m 435 342 CONFIG_CRC_T10DIF=y 436 - CONFIG_CRC32=m 343 + CONFIG_XZ_DEC_X86=y 344 + CONFIG_XZ_DEC_POWERPC=y 345 + CONFIG_XZ_DEC_IA64=y 346 + CONFIG_XZ_DEC_ARM=y 347 + CONFIG_XZ_DEC_ARMTHUMB=y 348 + CONFIG_XZ_DEC_SPARC=y 349 + CONFIG_XZ_DEC_TEST=m
+160 -54
arch/m68k/configs/hp300_defconfig
··· 1 - CONFIG_EXPERIMENTAL=y 2 1 CONFIG_LOCALVERSION="-hp300" 3 2 CONFIG_SYSVIPC=y 4 3 CONFIG_POSIX_MQUEUE=y 4 + CONFIG_FHANDLE=y 5 5 CONFIG_BSD_PROCESS_ACCT=y 6 - CONFIG_LOG_BUF_SHIFT=14 7 - CONFIG_RELAY=y 6 + CONFIG_BSD_PROCESS_ACCT_V3=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 12 CONFIG_BLK_DEV_INITRD=y 9 - # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 10 13 CONFIG_SLAB=y 11 14 CONFIG_MODULES=y 12 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 28 CONFIG_M68020=y 15 29 CONFIG_M68030=y 16 30 CONFIG_M68040=y 17 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 36 CONFIG_BINFMT_AOUT=m 19 37 CONFIG_BINFMT_MISC=m 20 - CONFIG_PROC_HARDWARE=y 21 38 CONFIG_NET=y 22 39 CONFIG_PACKET=y 40 + CONFIG_PACKET_DIAG=m 23 41 CONFIG_UNIX=y 42 + CONFIG_UNIX_DIAG=m 43 + CONFIG_XFRM_MIGRATE=y 24 44 CONFIG_NET_KEY=y 25 - CONFIG_NET_KEY_MIGRATE=y 26 45 CONFIG_INET=y 27 46 CONFIG_IP_PNP=y 28 47 CONFIG_IP_PNP_DHCP=y 29 48 CONFIG_IP_PNP_BOOTP=y 30 49 CONFIG_IP_PNP_RARP=y 31 50 CONFIG_NET_IPIP=m 51 + CONFIG_NET_IPGRE_DEMUX=m 32 52 CONFIG_NET_IPGRE=m 33 53 CONFIG_SYN_COOKIES=y 54 + CONFIG_NET_IPVTI=m 34 55 CONFIG_INET_AH=m 35 56 CONFIG_INET_ESP=m 36 57 CONFIG_INET_IPCOMP=m 37 58 CONFIG_INET_XFRM_MODE_TRANSPORT=m 38 59 CONFIG_INET_XFRM_MODE_TUNNEL=m 39 60 CONFIG_INET_XFRM_MODE_BEET=m 61 + # CONFIG_INET_LRO is not set 40 62 CONFIG_INET_DIAG=m 63 + CONFIG_INET_UDP_DIAG=m 41 64 CONFIG_IPV6_PRIVACY=y 42 65 CONFIG_IPV6_ROUTER_PREF=y 43 - CONFIG_IPV6_ROUTE_INFO=y 44 66 CONFIG_INET6_AH=m 45 67 CONFIG_INET6_ESP=m 46 68 CONFIG_INET6_IPCOMP=m 47 - CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 48 - CONFIG_IPV6_TUNNEL=m 69 + CONFIG_IPV6_GRE=m 49 70 CONFIG_NETFILTER=y 50 - CONFIG_NETFILTER_NETLINK_QUEUE=m 51 71 CONFIG_NF_CONNTRACK=m 72 + CONFIG_NF_CONNTRACK_ZONES=y 73 + # CONFIG_NF_CONNTRACK_PROCFS is not set 52 74 # CONFIG_NF_CT_PROTO_DCCP is not set 53 75 CONFIG_NF_CT_PROTO_UDPLITE=m 54 76 CONFIG_NF_CONNTRACK_AMANDA=m ··· 78 56 CONFIG_NF_CONNTRACK_H323=m 79 57 CONFIG_NF_CONNTRACK_IRC=m 80 58 CONFIG_NF_CONNTRACK_NETBIOS_NS=m 59 + CONFIG_NF_CONNTRACK_SNMP=m 81 60 CONFIG_NF_CONNTRACK_PPTP=m 82 61 CONFIG_NF_CONNTRACK_SANE=m 83 62 CONFIG_NF_CONNTRACK_SIP=m 84 63 CONFIG_NF_CONNTRACK_TFTP=m 64 + CONFIG_NETFILTER_XT_SET=m 65 + CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 85 66 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 86 67 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 87 68 CONFIG_NETFILTER_XT_TARGET_DSCP=m 69 + CONFIG_NETFILTER_XT_TARGET_HMARK=m 70 + CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m 71 + CONFIG_NETFILTER_XT_TARGET_LOG=m 88 72 CONFIG_NETFILTER_XT_TARGET_MARK=m 89 73 CONFIG_NETFILTER_XT_TARGET_NFLOG=m 90 74 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 75 + CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 76 + CONFIG_NETFILTER_XT_TARGET_TEE=m 91 77 CONFIG_NETFILTER_XT_TARGET_TRACE=m 92 78 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 93 79 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 80 + CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m 81 + CONFIG_NETFILTER_XT_MATCH_BPF=m 94 82 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m 95 83 CONFIG_NETFILTER_XT_MATCH_COMMENT=m 96 84 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 85 + CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m 97 86 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 98 87 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 99 88 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 89 + CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m 100 90 CONFIG_NETFILTER_XT_MATCH_DSCP=m 101 91 CONFIG_NETFILTER_XT_MATCH_ESP=m 102 92 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m ··· 119 85 CONFIG_NETFILTER_XT_MATCH_MAC=m 120 86 CONFIG_NETFILTER_XT_MATCH_MARK=m 121 87 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 88 + CONFIG_NETFILTER_XT_MATCH_NFACCT=m 89 + CONFIG_NETFILTER_XT_MATCH_OSF=m 122 90 CONFIG_NETFILTER_XT_MATCH_OWNER=m 123 91 CONFIG_NETFILTER_XT_MATCH_POLICY=m 124 92 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m ··· 134 98 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 135 99 CONFIG_NETFILTER_XT_MATCH_TIME=m 136 100 CONFIG_NETFILTER_XT_MATCH_U32=m 101 + CONFIG_IP_SET=m 102 + CONFIG_IP_SET_BITMAP_IP=m 103 + CONFIG_IP_SET_BITMAP_IPMAC=m 104 + CONFIG_IP_SET_BITMAP_PORT=m 105 + CONFIG_IP_SET_HASH_IP=m 106 + CONFIG_IP_SET_HASH_IPPORT=m 107 + CONFIG_IP_SET_HASH_IPPORTIP=m 108 + CONFIG_IP_SET_HASH_IPPORTNET=m 109 + CONFIG_IP_SET_HASH_NET=m 110 + CONFIG_IP_SET_HASH_NETPORT=m 111 + CONFIG_IP_SET_HASH_NETIFACE=m 112 + CONFIG_IP_SET_LIST_SET=m 137 113 CONFIG_NF_CONNTRACK_IPV4=m 138 - CONFIG_IP_NF_QUEUE=m 139 114 CONFIG_IP_NF_IPTABLES=m 140 - CONFIG_IP_NF_MATCH_ADDRTYPE=m 141 115 CONFIG_IP_NF_MATCH_AH=m 142 116 CONFIG_IP_NF_MATCH_ECN=m 117 + CONFIG_IP_NF_MATCH_RPFILTER=m 143 118 CONFIG_IP_NF_MATCH_TTL=m 144 119 CONFIG_IP_NF_FILTER=m 145 120 CONFIG_IP_NF_TARGET_REJECT=m 146 - CONFIG_IP_NF_TARGET_LOG=m 147 121 CONFIG_IP_NF_TARGET_ULOG=m 148 - CONFIG_NF_NAT=m 122 + CONFIG_NF_NAT_IPV4=m 149 123 CONFIG_IP_NF_TARGET_MASQUERADE=m 150 124 CONFIG_IP_NF_TARGET_NETMAP=m 151 125 CONFIG_IP_NF_TARGET_REDIRECT=m 152 - CONFIG_NF_NAT_SNMP_BASIC=m 153 126 CONFIG_IP_NF_MANGLE=m 154 127 CONFIG_IP_NF_TARGET_CLUSTERIP=m 155 128 CONFIG_IP_NF_TARGET_ECN=m ··· 168 123 CONFIG_IP_NF_ARPFILTER=m 169 124 CONFIG_IP_NF_ARP_MANGLE=m 170 125 CONFIG_NF_CONNTRACK_IPV6=m 171 - CONFIG_IP6_NF_QUEUE=m 172 126 CONFIG_IP6_NF_IPTABLES=m 173 127 CONFIG_IP6_NF_MATCH_AH=m 174 128 CONFIG_IP6_NF_MATCH_EUI64=m ··· 176 132 CONFIG_IP6_NF_MATCH_HL=m 177 133 CONFIG_IP6_NF_MATCH_IPV6HEADER=m 178 134 CONFIG_IP6_NF_MATCH_MH=m 135 + CONFIG_IP6_NF_MATCH_RPFILTER=m 179 136 CONFIG_IP6_NF_MATCH_RT=m 180 137 CONFIG_IP6_NF_TARGET_HL=m 181 - CONFIG_IP6_NF_TARGET_LOG=m 182 138 CONFIG_IP6_NF_FILTER=m 183 139 CONFIG_IP6_NF_TARGET_REJECT=m 184 140 CONFIG_IP6_NF_MANGLE=m 185 141 CONFIG_IP6_NF_RAW=m 142 + CONFIG_NF_NAT_IPV6=m 143 + CONFIG_IP6_NF_TARGET_MASQUERADE=m 144 + CONFIG_IP6_NF_TARGET_NPT=m 186 145 CONFIG_IP_DCCP=m 187 146 # CONFIG_IP_DCCP_CCID3 is not set 147 + CONFIG_SCTP_COOKIE_HMAC_SHA1=y 148 + CONFIG_RDS=m 149 + CONFIG_RDS_TCP=m 150 + CONFIG_L2TP=m 188 151 CONFIG_ATALK=m 152 + CONFIG_BATMAN_ADV=m 153 + CONFIG_BATMAN_ADV_DAT=y 154 + # CONFIG_WIRELESS is not set 189 155 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 156 + CONFIG_DEVTMPFS=y 190 157 # CONFIG_FIRMWARE_IN_KERNEL is not set 158 + # CONFIG_FW_LOADER_USER_HELPER is not set 191 159 CONFIG_CONNECTOR=m 192 160 CONFIG_BLK_DEV_LOOP=y 193 161 CONFIG_BLK_DEV_CRYPTOLOOP=m 162 + CONFIG_BLK_DEV_DRBD=m 194 163 CONFIG_BLK_DEV_NBD=m 195 164 CONFIG_BLK_DEV_RAM=y 196 165 CONFIG_CDROM_PKTCDVD=m ··· 218 161 CONFIG_BLK_DEV_SR_VENDOR=y 219 162 CONFIG_CHR_DEV_SG=m 220 163 CONFIG_SCSI_CONSTANTS=y 221 - CONFIG_SCSI_SAS_LIBSAS=m 222 - # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set 223 - CONFIG_SCSI_SRP_ATTRS=m 224 - CONFIG_SCSI_SRP_TGT_ATTRS=y 164 + CONFIG_SCSI_SAS_ATTRS=m 225 165 CONFIG_ISCSI_TCP=m 166 + CONFIG_ISCSI_BOOT_SYSFS=m 226 167 CONFIG_MD=y 227 - CONFIG_BLK_DEV_MD=m 228 168 CONFIG_MD_LINEAR=m 229 169 CONFIG_MD_RAID0=m 230 - CONFIG_MD_RAID1=m 231 - CONFIG_MD_RAID456=m 232 170 CONFIG_BLK_DEV_DM=m 233 171 CONFIG_DM_CRYPT=m 234 172 CONFIG_DM_SNAPSHOT=m 173 + CONFIG_DM_THIN_PROVISIONING=m 174 + CONFIG_DM_CACHE=m 235 175 CONFIG_DM_MIRROR=m 176 + CONFIG_DM_RAID=m 236 177 CONFIG_DM_ZERO=m 237 178 CONFIG_DM_MULTIPATH=m 238 179 CONFIG_DM_UEVENT=y 180 + CONFIG_TARGET_CORE=m 181 + CONFIG_TCM_IBLOCK=m 182 + CONFIG_TCM_FILEIO=m 183 + CONFIG_TCM_PSCSI=m 239 184 CONFIG_NETDEVICES=y 240 185 CONFIG_DUMMY=m 241 - CONFIG_MACVLAN=m 242 186 CONFIG_EQUALIZER=m 187 + CONFIG_NET_TEAM=m 188 + CONFIG_NET_TEAM_MODE_BROADCAST=m 189 + CONFIG_NET_TEAM_MODE_ROUNDROBIN=m 190 + CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 191 + CONFIG_NET_TEAM_MODE_LOADBALANCE=m 192 + CONFIG_VXLAN=m 193 + CONFIG_NETCONSOLE=m 194 + CONFIG_NETCONSOLE_DYNAMIC=y 243 195 CONFIG_VETH=m 244 - CONFIG_NET_ETHERNET=y 245 196 CONFIG_HPLANCE=y 246 - # CONFIG_NETDEV_1000 is not set 247 - # CONFIG_NETDEV_10000 is not set 197 + # CONFIG_NET_CADENCE is not set 198 + # CONFIG_NET_VENDOR_BROADCOM is not set 199 + # CONFIG_NET_VENDOR_INTEL is not set 200 + # CONFIG_NET_VENDOR_MARVELL is not set 201 + # CONFIG_NET_VENDOR_MICREL is not set 202 + # CONFIG_NET_VENDOR_NATSEMI is not set 203 + # CONFIG_NET_VENDOR_SEEQ is not set 204 + # CONFIG_NET_VENDOR_STMICRO is not set 205 + # CONFIG_NET_VENDOR_WIZNET is not set 248 206 CONFIG_PPP=m 249 - CONFIG_PPP_FILTER=y 250 - CONFIG_PPP_ASYNC=m 251 - CONFIG_PPP_SYNC_TTY=m 252 - CONFIG_PPP_DEFLATE=m 253 207 CONFIG_PPP_BSDCOMP=m 208 + CONFIG_PPP_DEFLATE=m 209 + CONFIG_PPP_FILTER=y 254 210 CONFIG_PPP_MPPE=m 255 211 CONFIG_PPPOE=m 212 + CONFIG_PPTP=m 213 + CONFIG_PPPOL2TP=m 214 + CONFIG_PPP_ASYNC=m 215 + CONFIG_PPP_SYNC_TTY=m 256 216 CONFIG_SLIP=m 257 217 CONFIG_SLIP_COMPRESSED=y 258 218 CONFIG_SLIP_SMART=y 259 219 CONFIG_SLIP_MODE_SLIP6=y 260 - CONFIG_NETCONSOLE=m 261 - CONFIG_NETCONSOLE_DYNAMIC=y 262 - CONFIG_INPUT_FF_MEMLESS=m 220 + # CONFIG_WLAN is not set 221 + CONFIG_INPUT_EVDEV=m 263 222 # CONFIG_KEYBOARD_ATKBD is not set 264 - CONFIG_MOUSE_PS2=m 223 + # CONFIG_MOUSE_PS2 is not set 265 224 CONFIG_MOUSE_SERIAL=m 266 225 CONFIG_INPUT_MISC=y 267 226 CONFIG_HP_SDC_RTC=m 268 - # CONFIG_SERIO_SERPORT is not set 227 + CONFIG_SERIO_SERPORT=m 269 228 CONFIG_VT_HW_CONSOLE_BINDING=y 229 + # CONFIG_LEGACY_PTYS is not set 270 230 # CONFIG_DEVKMEM is not set 271 231 # CONFIG_HW_RANDOM is not set 272 - CONFIG_GEN_RTC=m 273 - CONFIG_GEN_RTC_X=y 232 + CONFIG_NTP_PPS=y 233 + CONFIG_PPS_CLIENT_LDISC=m 234 + CONFIG_PTP_1588_CLOCK=m 274 235 # CONFIG_HWMON is not set 275 236 CONFIG_FB=y 276 237 CONFIG_FRAMEBUFFER_CONSOLE=y ··· 297 222 # CONFIG_LOGO_LINUX_VGA16 is not set 298 223 CONFIG_HID=m 299 224 CONFIG_HIDRAW=y 225 + CONFIG_UHID=m 226 + # CONFIG_HID_GENERIC is not set 300 227 # CONFIG_USB_SUPPORT is not set 228 + CONFIG_RTC_CLASS=y 229 + CONFIG_RTC_DRV_GENERIC=m 230 + # CONFIG_IOMMU_SUPPORT is not set 231 + CONFIG_PROC_HARDWARE=y 301 232 CONFIG_EXT2_FS=y 302 233 CONFIG_EXT3_FS=y 303 234 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 304 235 # CONFIG_EXT3_FS_XATTR is not set 236 + CONFIG_EXT4_FS=y 305 237 CONFIG_REISERFS_FS=m 306 238 CONFIG_JFS_FS=m 307 239 CONFIG_XFS_FS=m 308 240 CONFIG_OCFS2_FS=m 309 - # CONFIG_OCFS2_FS_STATS is not set 310 241 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 242 + CONFIG_FANOTIFY=y 311 243 CONFIG_QUOTA_NETLINK_INTERFACE=y 312 244 # CONFIG_PRINT_QUOTA_WARNING is not set 313 - CONFIG_AUTOFS_FS=m 314 245 CONFIG_AUTOFS4_FS=m 315 246 CONFIG_FUSE_FS=m 247 + CONFIG_CUSE=m 316 248 CONFIG_ISO9660_FS=y 317 249 CONFIG_JOLIET=y 318 250 CONFIG_ZISOFS=y 319 251 CONFIG_UDF_FS=m 320 - CONFIG_MSDOS_FS=y 252 + CONFIG_MSDOS_FS=m 321 253 CONFIG_VFAT_FS=m 322 254 CONFIG_PROC_KCORE=y 323 255 CONFIG_TMPFS=y 324 256 CONFIG_AFFS_FS=m 257 + CONFIG_ECRYPT_FS=m 258 + CONFIG_ECRYPT_FS_MESSAGING=y 325 259 CONFIG_HFS_FS=m 326 260 CONFIG_HFSPLUS_FS=m 327 261 CONFIG_CRAMFS=m 328 262 CONFIG_SQUASHFS=m 329 - CONFIG_MINIX_FS=y 263 + CONFIG_SQUASHFS_LZO=y 264 + CONFIG_MINIX_FS=m 265 + CONFIG_OMFS_FS=m 330 266 CONFIG_HPFS_FS=m 267 + CONFIG_QNX4FS_FS=m 268 + CONFIG_QNX6FS_FS=m 331 269 CONFIG_SYSV_FS=m 332 270 CONFIG_UFS_FS=m 333 271 CONFIG_NFS_FS=y 334 - CONFIG_NFS_V3=y 335 272 CONFIG_NFS_V4=y 273 + CONFIG_NFS_SWAP=y 336 274 CONFIG_ROOT_NFS=y 337 275 CONFIG_NFSD=m 338 276 CONFIG_NFSD_V3=y 339 - CONFIG_SMB_FS=m 340 - CONFIG_SMB_NLS_DEFAULT=y 277 + CONFIG_CIFS=m 278 + # CONFIG_CIFS_DEBUG is not set 341 279 CONFIG_CODA_FS=m 342 280 CONFIG_NLS_CODEPAGE_437=y 343 281 CONFIG_NLS_CODEPAGE_737=m ··· 389 301 CONFIG_NLS_ISO8859_15=m 390 302 CONFIG_NLS_KOI8_R=m 391 303 CONFIG_NLS_KOI8_U=m 304 + CONFIG_NLS_MAC_ROMAN=m 305 + CONFIG_NLS_MAC_CELTIC=m 306 + CONFIG_NLS_MAC_CENTEURO=m 307 + CONFIG_NLS_MAC_CROATIAN=m 308 + CONFIG_NLS_MAC_CYRILLIC=m 309 + CONFIG_NLS_MAC_GAELIC=m 310 + CONFIG_NLS_MAC_GREEK=m 311 + CONFIG_NLS_MAC_ICELAND=m 312 + CONFIG_NLS_MAC_INUIT=m 313 + CONFIG_NLS_MAC_ROMANIAN=m 314 + CONFIG_NLS_MAC_TURKISH=m 392 315 CONFIG_DLM=m 393 316 CONFIG_MAGIC_SYSRQ=y 394 - # CONFIG_RCU_CPU_STALL_DETECTOR is not set 395 - CONFIG_SYSCTL_SYSCALL_CHECK=y 317 + CONFIG_ASYNC_RAID6_TEST=m 318 + CONFIG_ENCRYPTED_KEYS=m 319 + CONFIG_CRYPTO_MANAGER=y 320 + CONFIG_CRYPTO_USER=m 396 321 CONFIG_CRYPTO_NULL=m 397 322 CONFIG_CRYPTO_CRYPTD=m 398 323 CONFIG_CRYPTO_TEST=m ··· 415 314 CONFIG_CRYPTO_LRW=m 416 315 CONFIG_CRYPTO_PCBC=m 417 316 CONFIG_CRYPTO_XTS=m 418 - CONFIG_CRYPTO_HMAC=y 419 317 CONFIG_CRYPTO_XCBC=m 420 - CONFIG_CRYPTO_MD4=m 318 + CONFIG_CRYPTO_VMAC=m 421 319 CONFIG_CRYPTO_MICHAEL_MIC=m 422 320 CONFIG_CRYPTO_RMD128=m 423 321 CONFIG_CRYPTO_RMD160=m 424 322 CONFIG_CRYPTO_RMD256=m 425 323 CONFIG_CRYPTO_RMD320=m 426 - CONFIG_CRYPTO_SHA256=m 427 324 CONFIG_CRYPTO_SHA512=m 428 325 CONFIG_CRYPTO_TGR192=m 429 326 CONFIG_CRYPTO_WP512=m 430 - CONFIG_CRYPTO_AES=m 431 327 CONFIG_CRYPTO_ANUBIS=m 432 328 CONFIG_CRYPTO_BLOWFISH=m 433 329 CONFIG_CRYPTO_CAMELLIA=m ··· 440 342 CONFIG_CRYPTO_ZLIB=m 441 343 CONFIG_CRYPTO_LZO=m 442 344 # CONFIG_CRYPTO_ANSI_CPRNG is not set 345 + CONFIG_CRYPTO_USER_API_HASH=m 346 + CONFIG_CRYPTO_USER_API_SKCIPHER=m 443 347 # CONFIG_CRYPTO_HW is not set 444 - CONFIG_CRC16=m 445 348 CONFIG_CRC_T10DIF=y 349 + CONFIG_XZ_DEC_X86=y 350 + CONFIG_XZ_DEC_POWERPC=y 351 + CONFIG_XZ_DEC_IA64=y 352 + CONFIG_XZ_DEC_ARM=y 353 + CONFIG_XZ_DEC_ARMTHUMB=y 354 + CONFIG_XZ_DEC_SPARC=y 355 + CONFIG_XZ_DEC_TEST=m
+172 -62
arch/m68k/configs/mac_defconfig
··· 1 - CONFIG_EXPERIMENTAL=y 2 1 CONFIG_LOCALVERSION="-mac" 3 2 CONFIG_SYSVIPC=y 4 3 CONFIG_POSIX_MQUEUE=y 4 + CONFIG_FHANDLE=y 5 5 CONFIG_BSD_PROCESS_ACCT=y 6 - CONFIG_LOG_BUF_SHIFT=14 7 - CONFIG_RELAY=y 6 + CONFIG_BSD_PROCESS_ACCT_V3=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 12 CONFIG_BLK_DEV_INITRD=y 9 - # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 10 13 CONFIG_SLAB=y 11 14 CONFIG_MODULES=y 12 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 27 CONFIG_M68020=y 15 28 CONFIG_M68030=y 16 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 35 CONFIG_BINFMT_AOUT=m 18 36 CONFIG_BINFMT_MISC=m 19 - CONFIG_PROC_HARDWARE=y 20 37 CONFIG_NET=y 21 38 CONFIG_PACKET=y 39 + CONFIG_PACKET_DIAG=m 22 40 CONFIG_UNIX=y 41 + CONFIG_UNIX_DIAG=m 42 + CONFIG_XFRM_MIGRATE=y 23 43 CONFIG_NET_KEY=y 24 - CONFIG_NET_KEY_MIGRATE=y 25 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 49 CONFIG_NET_IPIP=m 50 + CONFIG_NET_IPGRE_DEMUX=m 27 51 CONFIG_NET_IPGRE=m 28 52 CONFIG_SYN_COOKIES=y 53 + CONFIG_NET_IPVTI=m 29 54 CONFIG_INET_AH=m 30 55 CONFIG_INET_ESP=m 31 56 CONFIG_INET_IPCOMP=m 32 57 CONFIG_INET_XFRM_MODE_TRANSPORT=m 33 58 CONFIG_INET_XFRM_MODE_TUNNEL=m 34 59 CONFIG_INET_XFRM_MODE_BEET=m 60 + # CONFIG_INET_LRO is not set 35 61 CONFIG_INET_DIAG=m 62 + CONFIG_INET_UDP_DIAG=m 36 63 CONFIG_IPV6_PRIVACY=y 37 64 CONFIG_IPV6_ROUTER_PREF=y 38 - CONFIG_IPV6_ROUTE_INFO=y 39 65 CONFIG_INET6_AH=m 40 66 CONFIG_INET6_ESP=m 41 67 CONFIG_INET6_IPCOMP=m 42 - CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 43 - CONFIG_IPV6_TUNNEL=m 68 + CONFIG_IPV6_GRE=m 44 69 CONFIG_NETFILTER=y 45 - CONFIG_NETFILTER_NETLINK_QUEUE=m 46 70 CONFIG_NF_CONNTRACK=m 71 + CONFIG_NF_CONNTRACK_ZONES=y 72 + # CONFIG_NF_CONNTRACK_PROCFS is not set 47 73 # CONFIG_NF_CT_PROTO_DCCP is not set 48 74 CONFIG_NF_CT_PROTO_UDPLITE=m 49 75 CONFIG_NF_CONNTRACK_AMANDA=m ··· 77 51 CONFIG_NF_CONNTRACK_H323=m 78 52 CONFIG_NF_CONNTRACK_IRC=m 79 53 CONFIG_NF_CONNTRACK_NETBIOS_NS=m 54 + CONFIG_NF_CONNTRACK_SNMP=m 80 55 CONFIG_NF_CONNTRACK_PPTP=m 81 56 CONFIG_NF_CONNTRACK_SANE=m 82 57 CONFIG_NF_CONNTRACK_SIP=m 83 58 CONFIG_NF_CONNTRACK_TFTP=m 59 + CONFIG_NETFILTER_XT_SET=m 60 + CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 84 61 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 85 62 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 86 63 CONFIG_NETFILTER_XT_TARGET_DSCP=m 64 + CONFIG_NETFILTER_XT_TARGET_HMARK=m 65 + CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m 66 + CONFIG_NETFILTER_XT_TARGET_LOG=m 87 67 CONFIG_NETFILTER_XT_TARGET_MARK=m 88 68 CONFIG_NETFILTER_XT_TARGET_NFLOG=m 89 69 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 70 + CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 71 + CONFIG_NETFILTER_XT_TARGET_TEE=m 90 72 CONFIG_NETFILTER_XT_TARGET_TRACE=m 91 73 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 92 74 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 75 + CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m 76 + CONFIG_NETFILTER_XT_MATCH_BPF=m 93 77 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m 94 78 CONFIG_NETFILTER_XT_MATCH_COMMENT=m 95 79 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 80 + CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m 96 81 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 97 82 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 98 83 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 84 + CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m 99 85 CONFIG_NETFILTER_XT_MATCH_DSCP=m 100 86 CONFIG_NETFILTER_XT_MATCH_ESP=m 101 87 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m ··· 118 80 CONFIG_NETFILTER_XT_MATCH_MAC=m 119 81 CONFIG_NETFILTER_XT_MATCH_MARK=m 120 82 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 83 + CONFIG_NETFILTER_XT_MATCH_NFACCT=m 84 + CONFIG_NETFILTER_XT_MATCH_OSF=m 121 85 CONFIG_NETFILTER_XT_MATCH_OWNER=m 122 86 CONFIG_NETFILTER_XT_MATCH_POLICY=m 123 87 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m ··· 133 93 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 134 94 CONFIG_NETFILTER_XT_MATCH_TIME=m 135 95 CONFIG_NETFILTER_XT_MATCH_U32=m 96 + CONFIG_IP_SET=m 97 + CONFIG_IP_SET_BITMAP_IP=m 98 + CONFIG_IP_SET_BITMAP_IPMAC=m 99 + CONFIG_IP_SET_BITMAP_PORT=m 100 + CONFIG_IP_SET_HASH_IP=m 101 + CONFIG_IP_SET_HASH_IPPORT=m 102 + CONFIG_IP_SET_HASH_IPPORTIP=m 103 + CONFIG_IP_SET_HASH_IPPORTNET=m 104 + CONFIG_IP_SET_HASH_NET=m 105 + CONFIG_IP_SET_HASH_NETPORT=m 106 + CONFIG_IP_SET_HASH_NETIFACE=m 107 + CONFIG_IP_SET_LIST_SET=m 136 108 CONFIG_NF_CONNTRACK_IPV4=m 137 - CONFIG_IP_NF_QUEUE=m 138 109 CONFIG_IP_NF_IPTABLES=m 139 - CONFIG_IP_NF_MATCH_ADDRTYPE=m 140 110 CONFIG_IP_NF_MATCH_AH=m 141 111 CONFIG_IP_NF_MATCH_ECN=m 112 + CONFIG_IP_NF_MATCH_RPFILTER=m 142 113 CONFIG_IP_NF_MATCH_TTL=m 143 114 CONFIG_IP_NF_FILTER=m 144 115 CONFIG_IP_NF_TARGET_REJECT=m 145 - CONFIG_IP_NF_TARGET_LOG=m 146 116 CONFIG_IP_NF_TARGET_ULOG=m 147 - CONFIG_NF_NAT=m 117 + CONFIG_NF_NAT_IPV4=m 148 118 CONFIG_IP_NF_TARGET_MASQUERADE=m 149 119 CONFIG_IP_NF_TARGET_NETMAP=m 150 120 CONFIG_IP_NF_TARGET_REDIRECT=m 151 - CONFIG_NF_NAT_SNMP_BASIC=m 152 121 CONFIG_IP_NF_MANGLE=m 153 122 CONFIG_IP_NF_TARGET_CLUSTERIP=m 154 123 CONFIG_IP_NF_TARGET_ECN=m ··· 167 118 CONFIG_IP_NF_ARPFILTER=m 168 119 CONFIG_IP_NF_ARP_MANGLE=m 169 120 CONFIG_NF_CONNTRACK_IPV6=m 170 - CONFIG_IP6_NF_QUEUE=m 171 121 CONFIG_IP6_NF_IPTABLES=m 172 122 CONFIG_IP6_NF_MATCH_AH=m 173 123 CONFIG_IP6_NF_MATCH_EUI64=m ··· 175 127 CONFIG_IP6_NF_MATCH_HL=m 176 128 CONFIG_IP6_NF_MATCH_IPV6HEADER=m 177 129 CONFIG_IP6_NF_MATCH_MH=m 130 + CONFIG_IP6_NF_MATCH_RPFILTER=m 178 131 CONFIG_IP6_NF_MATCH_RT=m 179 132 CONFIG_IP6_NF_TARGET_HL=m 180 - CONFIG_IP6_NF_TARGET_LOG=m 181 133 CONFIG_IP6_NF_FILTER=m 182 134 CONFIG_IP6_NF_TARGET_REJECT=m 183 135 CONFIG_IP6_NF_MANGLE=m 184 136 CONFIG_IP6_NF_RAW=m 137 + CONFIG_NF_NAT_IPV6=m 138 + CONFIG_IP6_NF_TARGET_MASQUERADE=m 139 + CONFIG_IP6_NF_TARGET_NPT=m 185 140 CONFIG_IP_DCCP=m 186 141 # CONFIG_IP_DCCP_CCID3 is not set 142 + CONFIG_SCTP_COOKIE_HMAC_SHA1=y 143 + CONFIG_RDS=m 144 + CONFIG_RDS_TCP=m 145 + CONFIG_L2TP=m 187 146 CONFIG_ATALK=m 188 147 CONFIG_DEV_APPLETALK=m 189 148 CONFIG_IPDDP=m 190 149 CONFIG_IPDDP_ENCAP=y 191 150 CONFIG_IPDDP_DECAP=y 151 + CONFIG_BATMAN_ADV=m 152 + CONFIG_BATMAN_ADV_DAT=y 153 + # CONFIG_WIRELESS is not set 192 154 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 155 + CONFIG_DEVTMPFS=y 193 156 # CONFIG_FIRMWARE_IN_KERNEL is not set 157 + # CONFIG_FW_LOADER_USER_HELPER is not set 194 158 CONFIG_CONNECTOR=m 195 - CONFIG_BLK_DEV_SWIM=y 159 + CONFIG_BLK_DEV_SWIM=m 196 160 CONFIG_BLK_DEV_LOOP=y 197 161 CONFIG_BLK_DEV_CRYPTOLOOP=m 162 + CONFIG_BLK_DEV_DRBD=m 198 163 CONFIG_BLK_DEV_NBD=m 199 164 CONFIG_BLK_DEV_RAM=y 200 165 CONFIG_CDROM_PKTCDVD=m 201 166 CONFIG_ATA_OVER_ETH=m 202 167 CONFIG_IDE=y 168 + CONFIG_IDE_GD_ATAPI=y 203 169 CONFIG_BLK_DEV_IDECD=y 204 170 CONFIG_BLK_DEV_MAC_IDE=y 205 171 CONFIG_RAID_ATTRS=m ··· 226 164 CONFIG_BLK_DEV_SR_VENDOR=y 227 165 CONFIG_CHR_DEV_SG=m 228 166 CONFIG_SCSI_CONSTANTS=y 229 - CONFIG_SCSI_SAS_LIBSAS=m 230 - # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set 231 - CONFIG_SCSI_SRP_ATTRS=m 232 - CONFIG_SCSI_SRP_TGT_ATTRS=y 167 + CONFIG_SCSI_SAS_ATTRS=m 233 168 CONFIG_ISCSI_TCP=m 169 + CONFIG_ISCSI_BOOT_SYSFS=m 234 170 CONFIG_MAC_SCSI=y 235 171 CONFIG_SCSI_MAC_ESP=y 236 172 CONFIG_MD=y 237 - CONFIG_BLK_DEV_MD=m 238 173 CONFIG_MD_LINEAR=m 239 174 CONFIG_MD_RAID0=m 240 - CONFIG_MD_RAID1=m 241 - CONFIG_MD_RAID456=m 242 175 CONFIG_BLK_DEV_DM=m 243 176 CONFIG_DM_CRYPT=m 244 177 CONFIG_DM_SNAPSHOT=m 178 + CONFIG_DM_THIN_PROVISIONING=m 179 + CONFIG_DM_CACHE=m 245 180 CONFIG_DM_MIRROR=m 181 + CONFIG_DM_RAID=m 246 182 CONFIG_DM_ZERO=m 247 183 CONFIG_DM_MULTIPATH=m 248 184 CONFIG_DM_UEVENT=y 185 + CONFIG_TARGET_CORE=m 186 + CONFIG_TCM_IBLOCK=m 187 + CONFIG_TCM_FILEIO=m 188 + CONFIG_TCM_PSCSI=m 249 189 CONFIG_ADB=y 250 190 CONFIG_ADB_MACII=y 251 - CONFIG_ADB_MACIISI=y 252 191 CONFIG_ADB_IOP=y 253 192 CONFIG_ADB_PMU68K=y 254 193 CONFIG_ADB_CUDA=y ··· 257 194 CONFIG_MAC_EMUMOUSEBTN=y 258 195 CONFIG_NETDEVICES=y 259 196 CONFIG_DUMMY=m 260 - CONFIG_MACVLAN=m 261 197 CONFIG_EQUALIZER=m 198 + CONFIG_NET_TEAM=m 199 + CONFIG_NET_TEAM_MODE_BROADCAST=m 200 + CONFIG_NET_TEAM_MODE_ROUNDROBIN=m 201 + CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 202 + CONFIG_NET_TEAM_MODE_LOADBALANCE=m 203 + CONFIG_VXLAN=m 204 + CONFIG_NETCONSOLE=m 205 + CONFIG_NETCONSOLE_DYNAMIC=y 262 206 CONFIG_VETH=m 263 - CONFIG_NET_ETHERNET=y 264 - CONFIG_MAC8390=y 265 - CONFIG_MAC89x0=m 266 - CONFIG_MACSONIC=m 267 207 CONFIG_MACMACE=y 268 - # CONFIG_NETDEV_1000 is not set 269 - # CONFIG_NETDEV_10000 is not set 208 + # CONFIG_NET_CADENCE is not set 209 + # CONFIG_NET_VENDOR_BROADCOM is not set 210 + CONFIG_MAC89x0=y 211 + # CONFIG_NET_VENDOR_INTEL is not set 212 + # CONFIG_NET_VENDOR_MARVELL is not set 213 + # CONFIG_NET_VENDOR_MICREL is not set 214 + CONFIG_MACSONIC=y 215 + CONFIG_MAC8390=y 216 + # CONFIG_NET_VENDOR_SEEQ is not set 217 + # CONFIG_NET_VENDOR_SMSC is not set 218 + # CONFIG_NET_VENDOR_STMICRO is not set 219 + # CONFIG_NET_VENDOR_WIZNET is not set 270 220 CONFIG_PPP=m 271 - CONFIG_PPP_FILTER=y 272 - CONFIG_PPP_ASYNC=m 273 - CONFIG_PPP_SYNC_TTY=m 274 - CONFIG_PPP_DEFLATE=m 275 221 CONFIG_PPP_BSDCOMP=m 222 + CONFIG_PPP_DEFLATE=m 223 + CONFIG_PPP_FILTER=y 276 224 CONFIG_PPP_MPPE=m 277 225 CONFIG_PPPOE=m 226 + CONFIG_PPTP=m 227 + CONFIG_PPPOL2TP=m 228 + CONFIG_PPP_ASYNC=m 229 + CONFIG_PPP_SYNC_TTY=m 278 230 CONFIG_SLIP=m 279 231 CONFIG_SLIP_COMPRESSED=y 280 232 CONFIG_SLIP_SMART=y 281 233 CONFIG_SLIP_MODE_SLIP6=y 282 - CONFIG_NETCONSOLE=m 283 - CONFIG_NETCONSOLE_DYNAMIC=y 284 - CONFIG_INPUT_FF_MEMLESS=m 234 + # CONFIG_WLAN is not set 235 + CONFIG_INPUT_EVDEV=m 285 236 # CONFIG_KEYBOARD_ATKBD is not set 286 - CONFIG_MOUSE_PS2=m 237 + # CONFIG_MOUSE_PS2 is not set 287 238 CONFIG_MOUSE_SERIAL=m 288 239 CONFIG_INPUT_MISC=y 289 240 CONFIG_INPUT_M68K_BEEP=m 290 241 CONFIG_SERIO=m 291 - # CONFIG_SERIO_SERPORT is not set 292 242 CONFIG_VT_HW_CONSOLE_BINDING=y 243 + # CONFIG_LEGACY_PTYS is not set 293 244 # CONFIG_DEVKMEM is not set 294 245 CONFIG_SERIAL_PMACZILOG=y 295 246 CONFIG_SERIAL_PMACZILOG_TTYS=y 296 247 CONFIG_SERIAL_PMACZILOG_CONSOLE=y 297 248 # CONFIG_HW_RANDOM is not set 298 - CONFIG_GEN_RTC=m 299 - CONFIG_GEN_RTC_X=y 249 + CONFIG_NTP_PPS=y 250 + CONFIG_PPS_CLIENT_LDISC=m 251 + CONFIG_PTP_1588_CLOCK=m 300 252 # CONFIG_HWMON is not set 301 253 CONFIG_FB=y 302 254 CONFIG_FB_VALKYRIE=y ··· 320 242 CONFIG_LOGO=y 321 243 CONFIG_HID=m 322 244 CONFIG_HIDRAW=y 245 + CONFIG_UHID=m 246 + # CONFIG_HID_GENERIC is not set 323 247 # CONFIG_USB_SUPPORT is not set 248 + CONFIG_RTC_CLASS=y 249 + CONFIG_RTC_DRV_GENERIC=m 250 + # CONFIG_IOMMU_SUPPORT is not set 251 + CONFIG_PROC_HARDWARE=y 324 252 CONFIG_EXT2_FS=y 325 253 CONFIG_EXT3_FS=y 326 254 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 327 255 # CONFIG_EXT3_FS_XATTR is not set 256 + CONFIG_EXT4_FS=y 328 257 CONFIG_REISERFS_FS=m 329 258 CONFIG_JFS_FS=m 330 259 CONFIG_XFS_FS=m 331 260 CONFIG_OCFS2_FS=m 332 - # CONFIG_OCFS2_FS_STATS is not set 333 261 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 262 + CONFIG_FANOTIFY=y 334 263 CONFIG_QUOTA_NETLINK_INTERFACE=y 335 264 # CONFIG_PRINT_QUOTA_WARNING is not set 336 - CONFIG_AUTOFS_FS=m 337 265 CONFIG_AUTOFS4_FS=m 338 266 CONFIG_FUSE_FS=m 267 + CONFIG_CUSE=m 339 268 CONFIG_ISO9660_FS=y 340 269 CONFIG_JOLIET=y 341 270 CONFIG_ZISOFS=y 342 271 CONFIG_UDF_FS=m 343 - CONFIG_MSDOS_FS=y 272 + CONFIG_MSDOS_FS=m 344 273 CONFIG_VFAT_FS=m 345 274 CONFIG_PROC_KCORE=y 346 275 CONFIG_TMPFS=y 347 276 CONFIG_AFFS_FS=m 348 - CONFIG_HFS_FS=y 349 - CONFIG_HFSPLUS_FS=y 277 + CONFIG_ECRYPT_FS=m 278 + CONFIG_ECRYPT_FS_MESSAGING=y 279 + CONFIG_HFS_FS=m 280 + CONFIG_HFSPLUS_FS=m 350 281 CONFIG_CRAMFS=m 351 282 CONFIG_SQUASHFS=m 352 - CONFIG_MINIX_FS=y 283 + CONFIG_SQUASHFS_LZO=y 284 + CONFIG_MINIX_FS=m 285 + CONFIG_OMFS_FS=m 353 286 CONFIG_HPFS_FS=m 287 + CONFIG_QNX4FS_FS=m 288 + CONFIG_QNX6FS_FS=m 354 289 CONFIG_SYSV_FS=m 355 290 CONFIG_UFS_FS=m 356 - CONFIG_NFS_FS=m 357 - CONFIG_NFS_V3=y 291 + CONFIG_NFS_FS=y 358 292 CONFIG_NFS_V4=y 293 + CONFIG_NFS_SWAP=y 294 + CONFIG_ROOT_NFS=y 359 295 CONFIG_NFSD=m 360 296 CONFIG_NFSD_V3=y 361 - CONFIG_SMB_FS=m 362 - CONFIG_SMB_NLS_DEFAULT=y 297 + CONFIG_CIFS=m 298 + # CONFIG_CIFS_DEBUG is not set 363 299 CONFIG_CODA_FS=m 364 300 CONFIG_NLS_CODEPAGE_437=y 365 301 CONFIG_NLS_CODEPAGE_737=m ··· 412 320 CONFIG_NLS_ISO8859_15=m 413 321 CONFIG_NLS_KOI8_R=m 414 322 CONFIG_NLS_KOI8_U=m 323 + CONFIG_NLS_MAC_ROMAN=m 324 + CONFIG_NLS_MAC_CELTIC=m 325 + CONFIG_NLS_MAC_CENTEURO=m 326 + CONFIG_NLS_MAC_CROATIAN=m 327 + CONFIG_NLS_MAC_CYRILLIC=m 328 + CONFIG_NLS_MAC_GAELIC=m 329 + CONFIG_NLS_MAC_GREEK=m 330 + CONFIG_NLS_MAC_ICELAND=m 331 + CONFIG_NLS_MAC_INUIT=m 332 + CONFIG_NLS_MAC_ROMANIAN=m 333 + CONFIG_NLS_MAC_TURKISH=m 415 334 CONFIG_DLM=m 416 335 CONFIG_MAGIC_SYSRQ=y 417 - # CONFIG_RCU_CPU_STALL_DETECTOR is not set 418 - CONFIG_SYSCTL_SYSCALL_CHECK=y 336 + CONFIG_ASYNC_RAID6_TEST=m 337 + CONFIG_ENCRYPTED_KEYS=m 338 + CONFIG_CRYPTO_MANAGER=y 339 + CONFIG_CRYPTO_USER=m 419 340 CONFIG_CRYPTO_NULL=m 420 341 CONFIG_CRYPTO_CRYPTD=m 421 342 CONFIG_CRYPTO_TEST=m ··· 438 333 CONFIG_CRYPTO_LRW=m 439 334 CONFIG_CRYPTO_PCBC=m 440 335 CONFIG_CRYPTO_XTS=m 441 - CONFIG_CRYPTO_HMAC=y 442 336 CONFIG_CRYPTO_XCBC=m 443 - CONFIG_CRYPTO_MD4=m 337 + CONFIG_CRYPTO_VMAC=m 444 338 CONFIG_CRYPTO_MICHAEL_MIC=m 445 339 CONFIG_CRYPTO_RMD128=m 446 340 CONFIG_CRYPTO_RMD160=m 447 341 CONFIG_CRYPTO_RMD256=m 448 342 CONFIG_CRYPTO_RMD320=m 449 - CONFIG_CRYPTO_SHA256=m 450 343 CONFIG_CRYPTO_SHA512=m 451 344 CONFIG_CRYPTO_TGR192=m 452 345 CONFIG_CRYPTO_WP512=m 453 - CONFIG_CRYPTO_AES=m 454 346 CONFIG_CRYPTO_ANUBIS=m 455 347 CONFIG_CRYPTO_BLOWFISH=m 456 348 CONFIG_CRYPTO_CAMELLIA=m ··· 463 361 CONFIG_CRYPTO_ZLIB=m 464 362 CONFIG_CRYPTO_LZO=m 465 363 # CONFIG_CRYPTO_ANSI_CPRNG is not set 364 + CONFIG_CRYPTO_USER_API_HASH=m 365 + CONFIG_CRYPTO_USER_API_SKCIPHER=m 466 366 # CONFIG_CRYPTO_HW is not set 467 - CONFIG_CRC16=m 468 367 CONFIG_CRC_T10DIF=y 368 + CONFIG_XZ_DEC_X86=y 369 + CONFIG_XZ_DEC_POWERPC=y 370 + CONFIG_XZ_DEC_IA64=y 371 + CONFIG_XZ_DEC_ARM=y 372 + CONFIG_XZ_DEC_ARMTHUMB=y 373 + CONFIG_XZ_DEC_SPARC=y 374 + CONFIG_XZ_DEC_TEST=m
+186 -78
arch/m68k/configs/multi_defconfig
··· 1 - CONFIG_EXPERIMENTAL=y 2 1 CONFIG_LOCALVERSION="-multi" 3 2 CONFIG_SYSVIPC=y 4 3 CONFIG_POSIX_MQUEUE=y 4 + CONFIG_FHANDLE=y 5 5 CONFIG_BSD_PROCESS_ACCT=y 6 - CONFIG_LOG_BUF_SHIFT=14 7 - CONFIG_RELAY=y 6 + CONFIG_BSD_PROCESS_ACCT_V3=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 12 CONFIG_BLK_DEV_INITRD=y 9 - # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 10 13 CONFIG_SLAB=y 11 14 CONFIG_MODULES=y 12 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 27 CONFIG_AMIGA=y 14 28 CONFIG_ATARI=y 15 29 CONFIG_MAC=y ··· 35 21 CONFIG_HP300=y 36 22 CONFIG_SUN3X=y 37 23 CONFIG_Q40=y 38 - CONFIG_M68020=y 39 - CONFIG_M68040=y 40 - CONFIG_M68060=y 41 - CONFIG_BINFMT_AOUT=m 42 - CONFIG_BINFMT_MISC=m 43 24 CONFIG_ZORRO=y 44 25 CONFIG_AMIGA_PCMCIA=y 45 - CONFIG_STRAM_PROC=y 46 - CONFIG_HEARTBEAT=y 47 - CONFIG_PROC_HARDWARE=y 48 26 CONFIG_ZORRO_NAMES=y 27 + # CONFIG_COMPACTION is not set 28 + CONFIG_CLEANCACHE=y 29 + # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 30 + CONFIG_BINFMT_AOUT=m 31 + CONFIG_BINFMT_MISC=m 49 32 CONFIG_NET=y 50 33 CONFIG_PACKET=y 34 + CONFIG_PACKET_DIAG=m 51 35 CONFIG_UNIX=y 36 + CONFIG_UNIX_DIAG=m 37 + CONFIG_XFRM_MIGRATE=y 52 38 CONFIG_NET_KEY=y 53 - CONFIG_NET_KEY_MIGRATE=y 54 39 CONFIG_INET=y 55 40 CONFIG_IP_PNP=y 56 41 CONFIG_IP_PNP_DHCP=y 57 42 CONFIG_IP_PNP_BOOTP=y 58 43 CONFIG_IP_PNP_RARP=y 59 44 CONFIG_NET_IPIP=m 45 + CONFIG_NET_IPGRE_DEMUX=m 60 46 CONFIG_NET_IPGRE=m 61 47 CONFIG_SYN_COOKIES=y 48 + CONFIG_NET_IPVTI=m 62 49 CONFIG_INET_AH=m 63 50 CONFIG_INET_ESP=m 64 51 CONFIG_INET_IPCOMP=m 65 52 CONFIG_INET_XFRM_MODE_TRANSPORT=m 66 53 CONFIG_INET_XFRM_MODE_TUNNEL=m 67 54 CONFIG_INET_XFRM_MODE_BEET=m 55 + # CONFIG_INET_LRO is not set 68 56 CONFIG_INET_DIAG=m 57 + CONFIG_INET_UDP_DIAG=m 69 58 CONFIG_IPV6_PRIVACY=y 70 59 CONFIG_IPV6_ROUTER_PREF=y 71 - CONFIG_IPV6_ROUTE_INFO=y 72 60 CONFIG_INET6_AH=m 73 61 CONFIG_INET6_ESP=m 74 62 CONFIG_INET6_IPCOMP=m 75 - CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 76 - CONFIG_IPV6_TUNNEL=m 63 + CONFIG_IPV6_GRE=m 77 64 CONFIG_NETFILTER=y 78 - CONFIG_NETFILTER_NETLINK_QUEUE=m 79 65 CONFIG_NF_CONNTRACK=m 66 + CONFIG_NF_CONNTRACK_ZONES=y 67 + # CONFIG_NF_CONNTRACK_PROCFS is not set 80 68 # CONFIG_NF_CT_PROTO_DCCP is not set 81 69 CONFIG_NF_CT_PROTO_UDPLITE=m 82 70 CONFIG_NF_CONNTRACK_AMANDA=m ··· 86 70 CONFIG_NF_CONNTRACK_H323=m 87 71 CONFIG_NF_CONNTRACK_IRC=m 88 72 CONFIG_NF_CONNTRACK_NETBIOS_NS=m 73 + CONFIG_NF_CONNTRACK_SNMP=m 89 74 CONFIG_NF_CONNTRACK_PPTP=m 90 75 CONFIG_NF_CONNTRACK_SANE=m 91 76 CONFIG_NF_CONNTRACK_SIP=m 92 77 CONFIG_NF_CONNTRACK_TFTP=m 78 + CONFIG_NETFILTER_XT_SET=m 79 + CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 93 80 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 94 81 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 95 82 CONFIG_NETFILTER_XT_TARGET_DSCP=m 83 + CONFIG_NETFILTER_XT_TARGET_HMARK=m 84 + CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m 85 + CONFIG_NETFILTER_XT_TARGET_LOG=m 96 86 CONFIG_NETFILTER_XT_TARGET_MARK=m 97 87 CONFIG_NETFILTER_XT_TARGET_NFLOG=m 98 88 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 89 + CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 90 + CONFIG_NETFILTER_XT_TARGET_TEE=m 99 91 CONFIG_NETFILTER_XT_TARGET_TRACE=m 100 92 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 101 93 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 94 + CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m 95 + CONFIG_NETFILTER_XT_MATCH_BPF=m 102 96 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m 103 97 CONFIG_NETFILTER_XT_MATCH_COMMENT=m 104 98 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 99 + CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m 105 100 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 106 101 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 107 102 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 103 + CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m 108 104 CONFIG_NETFILTER_XT_MATCH_DSCP=m 109 105 CONFIG_NETFILTER_XT_MATCH_ESP=m 110 106 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m ··· 127 99 CONFIG_NETFILTER_XT_MATCH_MAC=m 128 100 CONFIG_NETFILTER_XT_MATCH_MARK=m 129 101 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 102 + CONFIG_NETFILTER_XT_MATCH_NFACCT=m 103 + CONFIG_NETFILTER_XT_MATCH_OSF=m 130 104 CONFIG_NETFILTER_XT_MATCH_OWNER=m 131 105 CONFIG_NETFILTER_XT_MATCH_POLICY=m 132 106 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m ··· 142 112 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 143 113 CONFIG_NETFILTER_XT_MATCH_TIME=m 144 114 CONFIG_NETFILTER_XT_MATCH_U32=m 115 + CONFIG_IP_SET=m 116 + CONFIG_IP_SET_BITMAP_IP=m 117 + CONFIG_IP_SET_BITMAP_IPMAC=m 118 + CONFIG_IP_SET_BITMAP_PORT=m 119 + CONFIG_IP_SET_HASH_IP=m 120 + CONFIG_IP_SET_HASH_IPPORT=m 121 + CONFIG_IP_SET_HASH_IPPORTIP=m 122 + CONFIG_IP_SET_HASH_IPPORTNET=m 123 + CONFIG_IP_SET_HASH_NET=m 124 + CONFIG_IP_SET_HASH_NETPORT=m 125 + CONFIG_IP_SET_HASH_NETIFACE=m 126 + CONFIG_IP_SET_LIST_SET=m 145 127 CONFIG_NF_CONNTRACK_IPV4=m 146 - CONFIG_IP_NF_QUEUE=m 147 128 CONFIG_IP_NF_IPTABLES=m 148 - CONFIG_IP_NF_MATCH_ADDRTYPE=m 149 129 CONFIG_IP_NF_MATCH_AH=m 150 130 CONFIG_IP_NF_MATCH_ECN=m 131 + CONFIG_IP_NF_MATCH_RPFILTER=m 151 132 CONFIG_IP_NF_MATCH_TTL=m 152 133 CONFIG_IP_NF_FILTER=m 153 134 CONFIG_IP_NF_TARGET_REJECT=m 154 - CONFIG_IP_NF_TARGET_LOG=m 155 135 CONFIG_IP_NF_TARGET_ULOG=m 156 - CONFIG_NF_NAT=m 136 + CONFIG_NF_NAT_IPV4=m 157 137 CONFIG_IP_NF_TARGET_MASQUERADE=m 158 138 CONFIG_IP_NF_TARGET_NETMAP=m 159 139 CONFIG_IP_NF_TARGET_REDIRECT=m 160 - CONFIG_NF_NAT_SNMP_BASIC=m 161 140 CONFIG_IP_NF_MANGLE=m 162 141 CONFIG_IP_NF_TARGET_CLUSTERIP=m 163 142 CONFIG_IP_NF_TARGET_ECN=m ··· 176 137 CONFIG_IP_NF_ARPFILTER=m 177 138 CONFIG_IP_NF_ARP_MANGLE=m 178 139 CONFIG_NF_CONNTRACK_IPV6=m 179 - CONFIG_IP6_NF_QUEUE=m 180 140 CONFIG_IP6_NF_IPTABLES=m 181 141 CONFIG_IP6_NF_MATCH_AH=m 182 142 CONFIG_IP6_NF_MATCH_EUI64=m ··· 184 146 CONFIG_IP6_NF_MATCH_HL=m 185 147 CONFIG_IP6_NF_MATCH_IPV6HEADER=m 186 148 CONFIG_IP6_NF_MATCH_MH=m 149 + CONFIG_IP6_NF_MATCH_RPFILTER=m 187 150 CONFIG_IP6_NF_MATCH_RT=m 188 151 CONFIG_IP6_NF_TARGET_HL=m 189 - CONFIG_IP6_NF_TARGET_LOG=m 190 152 CONFIG_IP6_NF_FILTER=m 191 153 CONFIG_IP6_NF_TARGET_REJECT=m 192 154 CONFIG_IP6_NF_MANGLE=m 193 155 CONFIG_IP6_NF_RAW=m 156 + CONFIG_NF_NAT_IPV6=m 157 + CONFIG_IP6_NF_TARGET_MASQUERADE=m 158 + CONFIG_IP6_NF_TARGET_NPT=m 194 159 CONFIG_IP_DCCP=m 195 160 # CONFIG_IP_DCCP_CCID3 is not set 161 + CONFIG_SCTP_COOKIE_HMAC_SHA1=y 162 + CONFIG_RDS=m 163 + CONFIG_RDS_TCP=m 164 + CONFIG_L2TP=m 196 165 CONFIG_ATALK=m 197 166 CONFIG_DEV_APPLETALK=m 198 167 CONFIG_IPDDP=m 199 168 CONFIG_IPDDP_ENCAP=y 200 169 CONFIG_IPDDP_DECAP=y 170 + CONFIG_BATMAN_ADV=m 171 + CONFIG_BATMAN_ADV_DAT=y 172 + # CONFIG_WIRELESS is not set 201 173 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 174 + CONFIG_DEVTMPFS=y 202 175 # CONFIG_FIRMWARE_IN_KERNEL is not set 176 + # CONFIG_FW_LOADER_USER_HELPER is not set 203 177 CONFIG_CONNECTOR=m 204 178 CONFIG_PARPORT=m 205 179 CONFIG_PARPORT_AMIGA=m ··· 220 170 CONFIG_PARPORT_1284=y 221 171 CONFIG_AMIGA_FLOPPY=y 222 172 CONFIG_ATARI_FLOPPY=y 223 - CONFIG_BLK_DEV_SWIM=y 173 + CONFIG_BLK_DEV_SWIM=m 224 174 CONFIG_AMIGA_Z2RAM=y 225 175 CONFIG_BLK_DEV_LOOP=y 226 176 CONFIG_BLK_DEV_CRYPTOLOOP=m 177 + CONFIG_BLK_DEV_DRBD=m 227 178 CONFIG_BLK_DEV_NBD=m 228 179 CONFIG_BLK_DEV_RAM=y 229 180 CONFIG_CDROM_PKTCDVD=m 230 181 CONFIG_ATA_OVER_ETH=m 231 182 CONFIG_IDE=y 183 + CONFIG_IDE_GD_ATAPI=y 232 184 CONFIG_BLK_DEV_IDECD=y 233 185 CONFIG_BLK_DEV_GAYLE=y 234 186 CONFIG_BLK_DEV_BUDDHA=y ··· 247 195 CONFIG_BLK_DEV_SR_VENDOR=y 248 196 CONFIG_CHR_DEV_SG=m 249 197 CONFIG_SCSI_CONSTANTS=y 250 - CONFIG_SCSI_SAS_LIBSAS=m 251 - # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set 252 - CONFIG_SCSI_SRP_ATTRS=m 253 - CONFIG_SCSI_SRP_TGT_ATTRS=y 198 + CONFIG_SCSI_SAS_ATTRS=m 254 199 CONFIG_ISCSI_TCP=m 200 + CONFIG_ISCSI_BOOT_SYSFS=m 255 201 CONFIG_A3000_SCSI=y 256 202 CONFIG_A2091_SCSI=y 257 203 CONFIG_GVP11_SCSI=y ··· 263 213 CONFIG_BVME6000_SCSI=y 264 214 CONFIG_SUN3X_ESP=y 265 215 CONFIG_MD=y 266 - CONFIG_BLK_DEV_MD=m 267 216 CONFIG_MD_LINEAR=m 268 217 CONFIG_MD_RAID0=m 269 - CONFIG_MD_RAID1=m 270 - CONFIG_MD_RAID456=m 271 218 CONFIG_BLK_DEV_DM=m 272 219 CONFIG_DM_CRYPT=m 273 220 CONFIG_DM_SNAPSHOT=m 221 + CONFIG_DM_THIN_PROVISIONING=m 222 + CONFIG_DM_CACHE=m 274 223 CONFIG_DM_MIRROR=m 224 + CONFIG_DM_RAID=m 275 225 CONFIG_DM_ZERO=m 276 226 CONFIG_DM_MULTIPATH=m 277 227 CONFIG_DM_UEVENT=y 228 + CONFIG_TARGET_CORE=m 229 + CONFIG_TCM_IBLOCK=m 230 + CONFIG_TCM_FILEIO=m 231 + CONFIG_TCM_PSCSI=m 278 232 CONFIG_ADB=y 279 233 CONFIG_ADB_MACII=y 280 - CONFIG_ADB_MACIISI=y 281 234 CONFIG_ADB_IOP=y 282 235 CONFIG_ADB_PMU68K=y 283 236 CONFIG_ADB_CUDA=y ··· 288 235 CONFIG_MAC_EMUMOUSEBTN=y 289 236 CONFIG_NETDEVICES=y 290 237 CONFIG_DUMMY=m 291 - CONFIG_MACVLAN=m 292 238 CONFIG_EQUALIZER=m 293 - CONFIG_VETH=m 294 - CONFIG_NET_ETHERNET=y 295 239 CONFIG_MII=y 296 - CONFIG_ARIADNE=y 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 248 + CONFIG_VETH=m 249 + # CONFIG_NET_VENDOR_3COM is not set 297 250 CONFIG_A2065=y 298 - CONFIG_HYDRA=y 299 - CONFIG_ZORRO8390=y 300 - CONFIG_APNE=y 301 - CONFIG_MAC8390=y 302 - CONFIG_MAC89x0=y 303 - CONFIG_MACSONIC=y 304 - CONFIG_MACMACE=y 305 - CONFIG_MVME147_NET=y 306 - CONFIG_MVME16x_NET=y 307 - CONFIG_BVME6000_NET=y 251 + CONFIG_ARIADNE=y 308 252 CONFIG_ATARILANCE=y 309 - CONFIG_SUN3LANCE=y 310 253 CONFIG_HPLANCE=y 254 + CONFIG_MVME147_NET=y 255 + CONFIG_SUN3LANCE=y 256 + CONFIG_MACMACE=y 257 + # CONFIG_NET_CADENCE is not set 258 + # CONFIG_NET_VENDOR_BROADCOM is not set 259 + CONFIG_MAC89x0=y 260 + # CONFIG_NET_VENDOR_FUJITSU is not set 261 + # CONFIG_NET_VENDOR_HP is not set 262 + CONFIG_BVME6000_NET=y 263 + CONFIG_MVME16x_NET=y 264 + # CONFIG_NET_VENDOR_MARVELL is not set 265 + # CONFIG_NET_VENDOR_MICREL is not set 266 + CONFIG_MACSONIC=y 267 + CONFIG_HYDRA=y 268 + CONFIG_MAC8390=y 311 269 CONFIG_NE2000=m 312 - # CONFIG_NETDEV_1000 is not set 313 - # CONFIG_NETDEV_10000 is not set 270 + CONFIG_APNE=y 271 + CONFIG_ZORRO8390=y 272 + # CONFIG_NET_VENDOR_SEEQ is not set 273 + # CONFIG_NET_VENDOR_STMICRO is not set 274 + # CONFIG_NET_VENDOR_WIZNET is not set 314 275 CONFIG_PPP=m 315 - CONFIG_PPP_FILTER=y 316 - CONFIG_PPP_ASYNC=m 317 - CONFIG_PPP_SYNC_TTY=m 318 - CONFIG_PPP_DEFLATE=m 319 276 CONFIG_PPP_BSDCOMP=m 277 + CONFIG_PPP_DEFLATE=m 278 + CONFIG_PPP_FILTER=y 320 279 CONFIG_PPP_MPPE=m 321 280 CONFIG_PPPOE=m 281 + CONFIG_PPTP=m 282 + CONFIG_PPPOL2TP=m 283 + CONFIG_PPP_ASYNC=m 284 + CONFIG_PPP_SYNC_TTY=m 322 285 CONFIG_SLIP=m 323 286 CONFIG_SLIP_COMPRESSED=y 324 287 CONFIG_SLIP_SMART=y 325 288 CONFIG_SLIP_MODE_SLIP6=y 326 - CONFIG_NETCONSOLE=m 327 - CONFIG_NETCONSOLE_DYNAMIC=y 328 - CONFIG_INPUT_FF_MEMLESS=m 289 + # CONFIG_WLAN is not set 290 + CONFIG_INPUT_EVDEV=m 329 291 CONFIG_KEYBOARD_AMIGA=y 330 292 CONFIG_KEYBOARD_ATARI=y 331 293 # CONFIG_KEYBOARD_ATKBD is not set 332 294 CONFIG_KEYBOARD_SUNKBD=y 333 - CONFIG_MOUSE_PS2=m 295 + # CONFIG_MOUSE_PS2 is not set 334 296 CONFIG_MOUSE_SERIAL=m 335 297 CONFIG_MOUSE_AMIGA=m 336 298 CONFIG_MOUSE_ATARI=m ··· 353 285 CONFIG_JOYSTICK_AMIGA=m 354 286 CONFIG_INPUT_MISC=y 355 287 CONFIG_INPUT_M68K_BEEP=m 356 - CONFIG_HP_SDC_RTC=y 357 - # CONFIG_SERIO_SERPORT is not set 288 + CONFIG_HP_SDC_RTC=m 358 289 CONFIG_SERIO_Q40KBD=y 359 290 CONFIG_VT_HW_CONSOLE_BINDING=y 291 + # CONFIG_LEGACY_PTYS is not set 360 292 # CONFIG_DEVKMEM is not set 361 293 CONFIG_SERIAL_PMACZILOG=y 362 294 CONFIG_SERIAL_PMACZILOG_TTYS=y 363 295 CONFIG_SERIAL_PMACZILOG_CONSOLE=y 364 296 CONFIG_PRINTER=m 365 297 # CONFIG_HW_RANDOM is not set 366 - CONFIG_GEN_RTC=y 367 - CONFIG_GEN_RTC_X=y 298 + CONFIG_NTP_PPS=y 299 + CONFIG_PPS_CLIENT_LDISC=m 300 + CONFIG_PPS_CLIENT_PARPORT=m 301 + CONFIG_PTP_1588_CLOCK=m 368 302 # CONFIG_HWMON is not set 369 303 CONFIG_FB=y 370 304 CONFIG_FB_CIRRUS=y ··· 386 316 CONFIG_DMASOUND_Q40=m 387 317 CONFIG_HID=m 388 318 CONFIG_HIDRAW=y 319 + CONFIG_UHID=m 320 + # CONFIG_HID_GENERIC is not set 389 321 # CONFIG_USB_SUPPORT is not set 322 + CONFIG_RTC_CLASS=y 323 + CONFIG_RTC_DRV_MSM6242=m 324 + CONFIG_RTC_DRV_RP5C01=m 325 + CONFIG_RTC_DRV_GENERIC=m 326 + # CONFIG_IOMMU_SUPPORT is not set 327 + CONFIG_HEARTBEAT=y 328 + CONFIG_PROC_HARDWARE=y 329 + CONFIG_NATFEAT=y 330 + CONFIG_NFBLOCK=y 331 + CONFIG_NFCON=y 332 + CONFIG_NFETH=y 390 333 CONFIG_ATARI_DSP56K=m 391 334 CONFIG_AMIGA_BUILTIN_SERIAL=y 392 335 CONFIG_SERIAL_CONSOLE=y ··· 407 324 CONFIG_EXT3_FS=y 408 325 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 409 326 # CONFIG_EXT3_FS_XATTR is not set 327 + CONFIG_EXT4_FS=y 410 328 CONFIG_REISERFS_FS=m 411 329 CONFIG_JFS_FS=m 412 330 CONFIG_XFS_FS=m 413 331 CONFIG_OCFS2_FS=m 414 - # CONFIG_OCFS2_FS_STATS is not set 415 332 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 333 + CONFIG_FANOTIFY=y 416 334 CONFIG_QUOTA_NETLINK_INTERFACE=y 417 335 # CONFIG_PRINT_QUOTA_WARNING is not set 418 - CONFIG_AUTOFS_FS=m 419 336 CONFIG_AUTOFS4_FS=m 420 337 CONFIG_FUSE_FS=m 338 + CONFIG_CUSE=m 421 339 CONFIG_ISO9660_FS=y 422 340 CONFIG_JOLIET=y 423 341 CONFIG_ZISOFS=y 424 342 CONFIG_UDF_FS=m 425 - CONFIG_MSDOS_FS=y 343 + CONFIG_MSDOS_FS=m 426 344 CONFIG_VFAT_FS=m 427 345 CONFIG_PROC_KCORE=y 428 346 CONFIG_TMPFS=y 429 347 CONFIG_AFFS_FS=m 430 - CONFIG_HFS_FS=y 431 - CONFIG_HFSPLUS_FS=y 348 + CONFIG_ECRYPT_FS=m 349 + CONFIG_ECRYPT_FS_MESSAGING=y 350 + CONFIG_HFS_FS=m 351 + CONFIG_HFSPLUS_FS=m 432 352 CONFIG_CRAMFS=m 433 353 CONFIG_SQUASHFS=m 434 - CONFIG_MINIX_FS=y 354 + CONFIG_SQUASHFS_LZO=y 355 + CONFIG_MINIX_FS=m 356 + CONFIG_OMFS_FS=m 435 357 CONFIG_HPFS_FS=m 358 + CONFIG_QNX4FS_FS=m 359 + CONFIG_QNX6FS_FS=m 436 360 CONFIG_SYSV_FS=m 437 361 CONFIG_UFS_FS=m 438 362 CONFIG_NFS_FS=y 439 - CONFIG_NFS_V3=y 440 363 CONFIG_NFS_V4=y 364 + CONFIG_NFS_SWAP=y 441 365 CONFIG_ROOT_NFS=y 442 366 CONFIG_NFSD=m 443 367 CONFIG_NFSD_V3=y 444 - CONFIG_SMB_FS=m 445 - CONFIG_SMB_NLS_DEFAULT=y 368 + CONFIG_CIFS=m 369 + # CONFIG_CIFS_DEBUG is not set 446 370 CONFIG_CODA_FS=m 447 371 CONFIG_NLS_CODEPAGE_437=y 448 372 CONFIG_NLS_CODEPAGE_737=m ··· 488 398 CONFIG_NLS_ISO8859_15=m 489 399 CONFIG_NLS_KOI8_R=m 490 400 CONFIG_NLS_KOI8_U=m 401 + CONFIG_NLS_MAC_ROMAN=m 402 + CONFIG_NLS_MAC_CELTIC=m 403 + CONFIG_NLS_MAC_CENTEURO=m 404 + CONFIG_NLS_MAC_CROATIAN=m 405 + CONFIG_NLS_MAC_CYRILLIC=m 406 + CONFIG_NLS_MAC_GAELIC=m 407 + CONFIG_NLS_MAC_GREEK=m 408 + CONFIG_NLS_MAC_ICELAND=m 409 + CONFIG_NLS_MAC_INUIT=m 410 + CONFIG_NLS_MAC_ROMANIAN=m 411 + CONFIG_NLS_MAC_TURKISH=m 491 412 CONFIG_DLM=m 492 413 CONFIG_MAGIC_SYSRQ=y 493 - # CONFIG_RCU_CPU_STALL_DETECTOR is not set 494 - CONFIG_SYSCTL_SYSCALL_CHECK=y 414 + CONFIG_ASYNC_RAID6_TEST=m 415 + CONFIG_ENCRYPTED_KEYS=m 416 + CONFIG_CRYPTO_MANAGER=y 417 + CONFIG_CRYPTO_USER=m 495 418 CONFIG_CRYPTO_NULL=m 496 419 CONFIG_CRYPTO_CRYPTD=m 497 420 CONFIG_CRYPTO_TEST=m ··· 514 411 CONFIG_CRYPTO_LRW=m 515 412 CONFIG_CRYPTO_PCBC=m 516 413 CONFIG_CRYPTO_XTS=m 517 - CONFIG_CRYPTO_HMAC=y 518 414 CONFIG_CRYPTO_XCBC=m 519 - CONFIG_CRYPTO_MD4=m 415 + CONFIG_CRYPTO_VMAC=m 520 416 CONFIG_CRYPTO_MICHAEL_MIC=m 521 417 CONFIG_CRYPTO_RMD128=m 522 418 CONFIG_CRYPTO_RMD160=m 523 419 CONFIG_CRYPTO_RMD256=m 524 420 CONFIG_CRYPTO_RMD320=m 525 - CONFIG_CRYPTO_SHA256=m 526 421 CONFIG_CRYPTO_SHA512=m 527 422 CONFIG_CRYPTO_TGR192=m 528 423 CONFIG_CRYPTO_WP512=m 529 - CONFIG_CRYPTO_AES=m 530 424 CONFIG_CRYPTO_ANUBIS=m 531 425 CONFIG_CRYPTO_BLOWFISH=m 532 426 CONFIG_CRYPTO_CAMELLIA=m ··· 539 439 CONFIG_CRYPTO_ZLIB=m 540 440 CONFIG_CRYPTO_LZO=m 541 441 # CONFIG_CRYPTO_ANSI_CPRNG is not set 442 + CONFIG_CRYPTO_USER_API_HASH=m 443 + CONFIG_CRYPTO_USER_API_SKCIPHER=m 542 444 # CONFIG_CRYPTO_HW is not set 543 - CONFIG_CRC16=y 544 445 CONFIG_CRC_T10DIF=y 446 + CONFIG_XZ_DEC_X86=y 447 + CONFIG_XZ_DEC_POWERPC=y 448 + CONFIG_XZ_DEC_IA64=y 449 + CONFIG_XZ_DEC_ARM=y 450 + CONFIG_XZ_DEC_ARMTHUMB=y 451 + CONFIG_XZ_DEC_SPARC=y 452 + CONFIG_XZ_DEC_TEST=m
+159 -56
arch/m68k/configs/mvme147_defconfig
··· 1 - CONFIG_EXPERIMENTAL=y 2 1 CONFIG_LOCALVERSION="-mvme147" 3 2 CONFIG_SYSVIPC=y 4 3 CONFIG_POSIX_MQUEUE=y 4 + CONFIG_FHANDLE=y 5 5 CONFIG_BSD_PROCESS_ACCT=y 6 - CONFIG_LOG_BUF_SHIFT=14 7 - CONFIG_RELAY=y 6 + CONFIG_BSD_PROCESS_ACCT_V3=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 12 CONFIG_BLK_DEV_INITRD=y 9 - # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 10 13 CONFIG_SLAB=y 11 14 CONFIG_MODULES=y 12 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 28 CONFIG_VME=y 14 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 33 CONFIG_BINFMT_AOUT=m 17 34 CONFIG_BINFMT_MISC=m 18 - CONFIG_PROC_HARDWARE=y 19 35 CONFIG_NET=y 20 36 CONFIG_PACKET=y 37 + CONFIG_PACKET_DIAG=m 21 38 CONFIG_UNIX=y 39 + CONFIG_UNIX_DIAG=m 40 + CONFIG_XFRM_MIGRATE=y 22 41 CONFIG_NET_KEY=y 23 - CONFIG_NET_KEY_MIGRATE=y 24 42 CONFIG_INET=y 25 43 CONFIG_IP_PNP=y 26 44 CONFIG_IP_PNP_DHCP=y 27 45 CONFIG_IP_PNP_BOOTP=y 28 46 CONFIG_IP_PNP_RARP=y 29 47 CONFIG_NET_IPIP=m 48 + CONFIG_NET_IPGRE_DEMUX=m 30 49 CONFIG_NET_IPGRE=m 31 50 CONFIG_SYN_COOKIES=y 51 + CONFIG_NET_IPVTI=m 32 52 CONFIG_INET_AH=m 33 53 CONFIG_INET_ESP=m 34 54 CONFIG_INET_IPCOMP=m 35 55 CONFIG_INET_XFRM_MODE_TRANSPORT=m 36 56 CONFIG_INET_XFRM_MODE_TUNNEL=m 37 57 CONFIG_INET_XFRM_MODE_BEET=m 58 + # CONFIG_INET_LRO is not set 38 59 CONFIG_INET_DIAG=m 60 + CONFIG_INET_UDP_DIAG=m 39 61 CONFIG_IPV6_PRIVACY=y 40 62 CONFIG_IPV6_ROUTER_PREF=y 41 - CONFIG_IPV6_ROUTE_INFO=y 42 63 CONFIG_INET6_AH=m 43 64 CONFIG_INET6_ESP=m 44 65 CONFIG_INET6_IPCOMP=m 45 - CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 46 - CONFIG_IPV6_TUNNEL=m 66 + CONFIG_IPV6_GRE=m 47 67 CONFIG_NETFILTER=y 48 - CONFIG_NETFILTER_NETLINK_QUEUE=m 49 68 CONFIG_NF_CONNTRACK=m 69 + CONFIG_NF_CONNTRACK_ZONES=y 70 + # CONFIG_NF_CONNTRACK_PROCFS is not set 50 71 # CONFIG_NF_CT_PROTO_DCCP is not set 51 72 CONFIG_NF_CT_PROTO_UDPLITE=m 52 73 CONFIG_NF_CONNTRACK_AMANDA=m ··· 75 54 CONFIG_NF_CONNTRACK_H323=m 76 55 CONFIG_NF_CONNTRACK_IRC=m 77 56 CONFIG_NF_CONNTRACK_NETBIOS_NS=m 57 + CONFIG_NF_CONNTRACK_SNMP=m 78 58 CONFIG_NF_CONNTRACK_PPTP=m 79 59 CONFIG_NF_CONNTRACK_SANE=m 80 60 CONFIG_NF_CONNTRACK_SIP=m 81 61 CONFIG_NF_CONNTRACK_TFTP=m 62 + CONFIG_NETFILTER_XT_SET=m 63 + CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 82 64 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 83 65 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 84 66 CONFIG_NETFILTER_XT_TARGET_DSCP=m 67 + CONFIG_NETFILTER_XT_TARGET_HMARK=m 68 + CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m 69 + CONFIG_NETFILTER_XT_TARGET_LOG=m 85 70 CONFIG_NETFILTER_XT_TARGET_MARK=m 86 71 CONFIG_NETFILTER_XT_TARGET_NFLOG=m 87 72 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 73 + CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 74 + CONFIG_NETFILTER_XT_TARGET_TEE=m 88 75 CONFIG_NETFILTER_XT_TARGET_TRACE=m 89 76 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 90 77 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 78 + CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m 79 + CONFIG_NETFILTER_XT_MATCH_BPF=m 91 80 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m 92 81 CONFIG_NETFILTER_XT_MATCH_COMMENT=m 93 82 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 83 + CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m 94 84 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 95 85 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 96 86 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 87 + CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m 97 88 CONFIG_NETFILTER_XT_MATCH_DSCP=m 98 89 CONFIG_NETFILTER_XT_MATCH_ESP=m 99 90 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m ··· 116 83 CONFIG_NETFILTER_XT_MATCH_MAC=m 117 84 CONFIG_NETFILTER_XT_MATCH_MARK=m 118 85 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 86 + CONFIG_NETFILTER_XT_MATCH_NFACCT=m 87 + CONFIG_NETFILTER_XT_MATCH_OSF=m 119 88 CONFIG_NETFILTER_XT_MATCH_OWNER=m 120 89 CONFIG_NETFILTER_XT_MATCH_POLICY=m 121 90 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m ··· 131 96 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 132 97 CONFIG_NETFILTER_XT_MATCH_TIME=m 133 98 CONFIG_NETFILTER_XT_MATCH_U32=m 99 + CONFIG_IP_SET=m 100 + CONFIG_IP_SET_BITMAP_IP=m 101 + CONFIG_IP_SET_BITMAP_IPMAC=m 102 + CONFIG_IP_SET_BITMAP_PORT=m 103 + CONFIG_IP_SET_HASH_IP=m 104 + CONFIG_IP_SET_HASH_IPPORT=m 105 + CONFIG_IP_SET_HASH_IPPORTIP=m 106 + CONFIG_IP_SET_HASH_IPPORTNET=m 107 + CONFIG_IP_SET_HASH_NET=m 108 + CONFIG_IP_SET_HASH_NETPORT=m 109 + CONFIG_IP_SET_HASH_NETIFACE=m 110 + CONFIG_IP_SET_LIST_SET=m 134 111 CONFIG_NF_CONNTRACK_IPV4=m 135 - CONFIG_IP_NF_QUEUE=m 136 112 CONFIG_IP_NF_IPTABLES=m 137 - CONFIG_IP_NF_MATCH_ADDRTYPE=m 138 113 CONFIG_IP_NF_MATCH_AH=m 139 114 CONFIG_IP_NF_MATCH_ECN=m 115 + CONFIG_IP_NF_MATCH_RPFILTER=m 140 116 CONFIG_IP_NF_MATCH_TTL=m 141 117 CONFIG_IP_NF_FILTER=m 142 118 CONFIG_IP_NF_TARGET_REJECT=m 143 - CONFIG_IP_NF_TARGET_LOG=m 144 119 CONFIG_IP_NF_TARGET_ULOG=m 145 - CONFIG_NF_NAT=m 120 + CONFIG_NF_NAT_IPV4=m 146 121 CONFIG_IP_NF_TARGET_MASQUERADE=m 147 122 CONFIG_IP_NF_TARGET_NETMAP=m 148 123 CONFIG_IP_NF_TARGET_REDIRECT=m 149 - CONFIG_NF_NAT_SNMP_BASIC=m 150 124 CONFIG_IP_NF_MANGLE=m 151 125 CONFIG_IP_NF_TARGET_CLUSTERIP=m 152 126 CONFIG_IP_NF_TARGET_ECN=m ··· 165 121 CONFIG_IP_NF_ARPFILTER=m 166 122 CONFIG_IP_NF_ARP_MANGLE=m 167 123 CONFIG_NF_CONNTRACK_IPV6=m 168 - CONFIG_IP6_NF_QUEUE=m 169 124 CONFIG_IP6_NF_IPTABLES=m 170 125 CONFIG_IP6_NF_MATCH_AH=m 171 126 CONFIG_IP6_NF_MATCH_EUI64=m ··· 173 130 CONFIG_IP6_NF_MATCH_HL=m 174 131 CONFIG_IP6_NF_MATCH_IPV6HEADER=m 175 132 CONFIG_IP6_NF_MATCH_MH=m 133 + CONFIG_IP6_NF_MATCH_RPFILTER=m 176 134 CONFIG_IP6_NF_MATCH_RT=m 177 135 CONFIG_IP6_NF_TARGET_HL=m 178 - CONFIG_IP6_NF_TARGET_LOG=m 179 136 CONFIG_IP6_NF_FILTER=m 180 137 CONFIG_IP6_NF_TARGET_REJECT=m 181 138 CONFIG_IP6_NF_MANGLE=m 182 139 CONFIG_IP6_NF_RAW=m 140 + CONFIG_NF_NAT_IPV6=m 141 + CONFIG_IP6_NF_TARGET_MASQUERADE=m 142 + CONFIG_IP6_NF_TARGET_NPT=m 183 143 CONFIG_IP_DCCP=m 184 144 # CONFIG_IP_DCCP_CCID3 is not set 145 + CONFIG_SCTP_COOKIE_HMAC_SHA1=y 146 + CONFIG_RDS=m 147 + CONFIG_RDS_TCP=m 148 + CONFIG_L2TP=m 185 149 CONFIG_ATALK=m 150 + CONFIG_BATMAN_ADV=m 151 + CONFIG_BATMAN_ADV_DAT=y 152 + # CONFIG_WIRELESS is not set 186 153 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 154 + CONFIG_DEVTMPFS=y 187 155 # CONFIG_FIRMWARE_IN_KERNEL is not set 156 + # CONFIG_FW_LOADER_USER_HELPER is not set 188 157 CONFIG_CONNECTOR=m 189 158 CONFIG_BLK_DEV_LOOP=y 190 159 CONFIG_BLK_DEV_CRYPTOLOOP=m 160 + CONFIG_BLK_DEV_DRBD=m 191 161 CONFIG_BLK_DEV_NBD=m 192 162 CONFIG_BLK_DEV_RAM=y 193 163 CONFIG_CDROM_PKTCDVD=m ··· 215 159 CONFIG_BLK_DEV_SR_VENDOR=y 216 160 CONFIG_CHR_DEV_SG=m 217 161 CONFIG_SCSI_CONSTANTS=y 218 - CONFIG_SCSI_SAS_LIBSAS=m 219 - # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set 220 - CONFIG_SCSI_SRP_ATTRS=m 221 - CONFIG_SCSI_SRP_TGT_ATTRS=y 162 + CONFIG_SCSI_SAS_ATTRS=m 222 163 CONFIG_ISCSI_TCP=m 164 + CONFIG_ISCSI_BOOT_SYSFS=m 223 165 CONFIG_MVME147_SCSI=y 224 166 CONFIG_MD=y 225 - CONFIG_BLK_DEV_MD=m 226 167 CONFIG_MD_LINEAR=m 227 168 CONFIG_MD_RAID0=m 228 - CONFIG_MD_RAID1=m 229 - CONFIG_MD_RAID456=m 230 169 CONFIG_BLK_DEV_DM=m 231 170 CONFIG_DM_CRYPT=m 232 171 CONFIG_DM_SNAPSHOT=m 172 + CONFIG_DM_THIN_PROVISIONING=m 173 + CONFIG_DM_CACHE=m 233 174 CONFIG_DM_MIRROR=m 175 + CONFIG_DM_RAID=m 234 176 CONFIG_DM_ZERO=m 235 177 CONFIG_DM_MULTIPATH=m 236 178 CONFIG_DM_UEVENT=y 179 + CONFIG_TARGET_CORE=m 180 + CONFIG_TCM_IBLOCK=m 181 + CONFIG_TCM_FILEIO=m 182 + CONFIG_TCM_PSCSI=m 237 183 CONFIG_NETDEVICES=y 238 184 CONFIG_DUMMY=m 239 - CONFIG_MACVLAN=m 240 185 CONFIG_EQUALIZER=m 186 + CONFIG_NET_TEAM=m 187 + CONFIG_NET_TEAM_MODE_BROADCAST=m 188 + CONFIG_NET_TEAM_MODE_ROUNDROBIN=m 189 + CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 190 + CONFIG_NET_TEAM_MODE_LOADBALANCE=m 191 + CONFIG_VXLAN=m 192 + CONFIG_NETCONSOLE=m 193 + CONFIG_NETCONSOLE_DYNAMIC=y 241 194 CONFIG_VETH=m 242 - CONFIG_NET_ETHERNET=y 243 195 CONFIG_MVME147_NET=y 244 - # CONFIG_NETDEV_1000 is not set 245 - # CONFIG_NETDEV_10000 is not set 196 + # CONFIG_NET_CADENCE is not set 197 + # CONFIG_NET_VENDOR_BROADCOM is not set 198 + # CONFIG_NET_VENDOR_INTEL is not set 199 + # CONFIG_NET_VENDOR_MARVELL is not set 200 + # CONFIG_NET_VENDOR_MICREL is not set 201 + # CONFIG_NET_VENDOR_NATSEMI is not set 202 + # CONFIG_NET_VENDOR_SEEQ is not set 203 + # CONFIG_NET_VENDOR_STMICRO is not set 204 + # CONFIG_NET_VENDOR_WIZNET is not set 246 205 CONFIG_PPP=m 247 - CONFIG_PPP_FILTER=y 248 - CONFIG_PPP_ASYNC=m 249 - CONFIG_PPP_SYNC_TTY=m 250 - CONFIG_PPP_DEFLATE=m 251 206 CONFIG_PPP_BSDCOMP=m 207 + CONFIG_PPP_DEFLATE=m 208 + CONFIG_PPP_FILTER=y 252 209 CONFIG_PPP_MPPE=m 253 210 CONFIG_PPPOE=m 211 + CONFIG_PPTP=m 212 + CONFIG_PPPOL2TP=m 213 + CONFIG_PPP_ASYNC=m 214 + CONFIG_PPP_SYNC_TTY=m 254 215 CONFIG_SLIP=m 255 216 CONFIG_SLIP_COMPRESSED=y 256 217 CONFIG_SLIP_SMART=y 257 218 CONFIG_SLIP_MODE_SLIP6=y 258 - CONFIG_NETCONSOLE=m 259 - CONFIG_NETCONSOLE_DYNAMIC=y 260 - CONFIG_INPUT_FF_MEMLESS=m 219 + # CONFIG_WLAN is not set 220 + CONFIG_INPUT_EVDEV=m 261 221 # CONFIG_KEYBOARD_ATKBD is not set 262 - CONFIG_MOUSE_PS2=m 263 - CONFIG_MOUSE_SERIAL=m 264 - CONFIG_SERIO=m 265 - # CONFIG_SERIO_SERPORT is not set 222 + # CONFIG_MOUSE_PS2 is not set 223 + # CONFIG_SERIO is not set 266 224 CONFIG_VT_HW_CONSOLE_BINDING=y 225 + # CONFIG_LEGACY_PTYS is not set 267 226 # CONFIG_DEVKMEM is not set 268 227 # CONFIG_HW_RANDOM is not set 269 - CONFIG_GEN_RTC=m 270 - CONFIG_GEN_RTC_X=y 228 + CONFIG_NTP_PPS=y 229 + CONFIG_PPS_CLIENT_LDISC=m 230 + CONFIG_PTP_1588_CLOCK=m 271 231 # CONFIG_HWMON is not set 272 232 CONFIG_HID=m 273 233 CONFIG_HIDRAW=y 234 + CONFIG_UHID=m 235 + # CONFIG_HID_GENERIC is not set 274 236 # CONFIG_USB_SUPPORT is not set 237 + CONFIG_RTC_CLASS=y 238 + CONFIG_RTC_DRV_GENERIC=m 239 + # CONFIG_IOMMU_SUPPORT is not set 240 + CONFIG_PROC_HARDWARE=y 275 241 CONFIG_EXT2_FS=y 276 242 CONFIG_EXT3_FS=y 277 243 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 278 244 # CONFIG_EXT3_FS_XATTR is not set 245 + CONFIG_EXT4_FS=y 279 246 CONFIG_REISERFS_FS=m 280 247 CONFIG_JFS_FS=m 281 248 CONFIG_XFS_FS=m 282 249 CONFIG_OCFS2_FS=m 283 - # CONFIG_OCFS2_FS_STATS is not set 284 250 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 251 + CONFIG_FANOTIFY=y 285 252 CONFIG_QUOTA_NETLINK_INTERFACE=y 286 253 # CONFIG_PRINT_QUOTA_WARNING is not set 287 - CONFIG_AUTOFS_FS=m 288 254 CONFIG_AUTOFS4_FS=m 289 255 CONFIG_FUSE_FS=m 256 + CONFIG_CUSE=m 290 257 CONFIG_ISO9660_FS=y 291 258 CONFIG_JOLIET=y 292 259 CONFIG_ZISOFS=y 293 260 CONFIG_UDF_FS=m 294 - CONFIG_MSDOS_FS=y 261 + CONFIG_MSDOS_FS=m 295 262 CONFIG_VFAT_FS=m 296 263 CONFIG_PROC_KCORE=y 297 264 CONFIG_TMPFS=y 298 265 CONFIG_AFFS_FS=m 266 + CONFIG_ECRYPT_FS=m 267 + CONFIG_ECRYPT_FS_MESSAGING=y 299 268 CONFIG_HFS_FS=m 300 269 CONFIG_HFSPLUS_FS=m 301 270 CONFIG_CRAMFS=m 302 271 CONFIG_SQUASHFS=m 303 - CONFIG_MINIX_FS=y 272 + CONFIG_SQUASHFS_LZO=y 273 + CONFIG_MINIX_FS=m 274 + CONFIG_OMFS_FS=m 304 275 CONFIG_HPFS_FS=m 276 + CONFIG_QNX4FS_FS=m 277 + CONFIG_QNX6FS_FS=m 305 278 CONFIG_SYSV_FS=m 306 279 CONFIG_UFS_FS=m 307 280 CONFIG_NFS_FS=y 308 - CONFIG_NFS_V3=y 309 281 CONFIG_NFS_V4=y 282 + CONFIG_NFS_SWAP=y 310 283 CONFIG_ROOT_NFS=y 311 284 CONFIG_NFSD=m 312 285 CONFIG_NFSD_V3=y 313 - CONFIG_SMB_FS=m 314 - CONFIG_SMB_NLS_DEFAULT=y 286 + CONFIG_CIFS=m 287 + # CONFIG_CIFS_DEBUG is not set 315 288 CONFIG_CODA_FS=m 316 289 CONFIG_NLS_CODEPAGE_437=y 317 290 CONFIG_NLS_CODEPAGE_737=m ··· 379 294 CONFIG_NLS_ISO8859_15=m 380 295 CONFIG_NLS_KOI8_R=m 381 296 CONFIG_NLS_KOI8_U=m 297 + CONFIG_NLS_MAC_ROMAN=m 298 + CONFIG_NLS_MAC_CELTIC=m 299 + CONFIG_NLS_MAC_CENTEURO=m 300 + CONFIG_NLS_MAC_CROATIAN=m 301 + CONFIG_NLS_MAC_CYRILLIC=m 302 + CONFIG_NLS_MAC_GAELIC=m 303 + CONFIG_NLS_MAC_GREEK=m 304 + CONFIG_NLS_MAC_ICELAND=m 305 + CONFIG_NLS_MAC_INUIT=m 306 + CONFIG_NLS_MAC_ROMANIAN=m 307 + CONFIG_NLS_MAC_TURKISH=m 382 308 CONFIG_DLM=m 383 309 CONFIG_MAGIC_SYSRQ=y 384 - # CONFIG_RCU_CPU_STALL_DETECTOR is not set 385 - CONFIG_SYSCTL_SYSCALL_CHECK=y 310 + CONFIG_ASYNC_RAID6_TEST=m 311 + CONFIG_ENCRYPTED_KEYS=m 312 + CONFIG_CRYPTO_MANAGER=y 313 + CONFIG_CRYPTO_USER=m 386 314 CONFIG_CRYPTO_NULL=m 387 315 CONFIG_CRYPTO_CRYPTD=m 388 316 CONFIG_CRYPTO_TEST=m ··· 405 307 CONFIG_CRYPTO_LRW=m 406 308 CONFIG_CRYPTO_PCBC=m 407 309 CONFIG_CRYPTO_XTS=m 408 - CONFIG_CRYPTO_HMAC=y 409 310 CONFIG_CRYPTO_XCBC=m 410 - CONFIG_CRYPTO_MD4=m 311 + CONFIG_CRYPTO_VMAC=m 411 312 CONFIG_CRYPTO_MICHAEL_MIC=m 412 313 CONFIG_CRYPTO_RMD128=m 413 314 CONFIG_CRYPTO_RMD160=m 414 315 CONFIG_CRYPTO_RMD256=m 415 316 CONFIG_CRYPTO_RMD320=m 416 - CONFIG_CRYPTO_SHA256=m 417 317 CONFIG_CRYPTO_SHA512=m 418 318 CONFIG_CRYPTO_TGR192=m 419 319 CONFIG_CRYPTO_WP512=m 420 - CONFIG_CRYPTO_AES=m 421 320 CONFIG_CRYPTO_ANUBIS=m 422 321 CONFIG_CRYPTO_BLOWFISH=m 423 322 CONFIG_CRYPTO_CAMELLIA=m ··· 430 335 CONFIG_CRYPTO_ZLIB=m 431 336 CONFIG_CRYPTO_LZO=m 432 337 # CONFIG_CRYPTO_ANSI_CPRNG is not set 338 + CONFIG_CRYPTO_USER_API_HASH=m 339 + CONFIG_CRYPTO_USER_API_SKCIPHER=m 433 340 # CONFIG_CRYPTO_HW is not set 434 - CONFIG_CRC16=m 435 341 CONFIG_CRC_T10DIF=y 342 + CONFIG_XZ_DEC_X86=y 343 + CONFIG_XZ_DEC_POWERPC=y 344 + CONFIG_XZ_DEC_IA64=y 345 + CONFIG_XZ_DEC_ARM=y 346 + CONFIG_XZ_DEC_ARMTHUMB=y 347 + CONFIG_XZ_DEC_SPARC=y 348 + CONFIG_XZ_DEC_TEST=m
+159 -57
arch/m68k/configs/mvme16x_defconfig
··· 1 - CONFIG_EXPERIMENTAL=y 2 1 CONFIG_LOCALVERSION="-mvme16x" 3 2 CONFIG_SYSVIPC=y 4 3 CONFIG_POSIX_MQUEUE=y 4 + CONFIG_FHANDLE=y 5 5 CONFIG_BSD_PROCESS_ACCT=y 6 - CONFIG_LOG_BUF_SHIFT=14 7 - CONFIG_RELAY=y 6 + CONFIG_BSD_PROCESS_ACCT_V3=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 12 CONFIG_BLK_DEV_INITRD=y 9 - # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 10 13 CONFIG_SLAB=y 11 14 CONFIG_MODULES=y 12 15 CONFIG_MODULE_UNLOAD=y 13 - CONFIG_VME=y 14 - CONFIG_MVME16x=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 15 27 CONFIG_M68040=y 16 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 34 CONFIG_BINFMT_AOUT=m 18 35 CONFIG_BINFMT_MISC=m 19 - CONFIG_PROC_HARDWARE=y 20 36 CONFIG_NET=y 21 37 CONFIG_PACKET=y 38 + CONFIG_PACKET_DIAG=m 22 39 CONFIG_UNIX=y 40 + CONFIG_UNIX_DIAG=m 41 + CONFIG_XFRM_MIGRATE=y 23 42 CONFIG_NET_KEY=y 24 - CONFIG_NET_KEY_MIGRATE=y 25 43 CONFIG_INET=y 26 44 CONFIG_IP_PNP=y 27 45 CONFIG_IP_PNP_DHCP=y 28 46 CONFIG_IP_PNP_BOOTP=y 29 47 CONFIG_IP_PNP_RARP=y 30 48 CONFIG_NET_IPIP=m 49 + CONFIG_NET_IPGRE_DEMUX=m 31 50 CONFIG_NET_IPGRE=m 32 51 CONFIG_SYN_COOKIES=y 52 + CONFIG_NET_IPVTI=m 33 53 CONFIG_INET_AH=m 34 54 CONFIG_INET_ESP=m 35 55 CONFIG_INET_IPCOMP=m 36 56 CONFIG_INET_XFRM_MODE_TRANSPORT=m 37 57 CONFIG_INET_XFRM_MODE_TUNNEL=m 38 58 CONFIG_INET_XFRM_MODE_BEET=m 59 + # CONFIG_INET_LRO is not set 39 60 CONFIG_INET_DIAG=m 61 + CONFIG_INET_UDP_DIAG=m 40 62 CONFIG_IPV6_PRIVACY=y 41 63 CONFIG_IPV6_ROUTER_PREF=y 42 - CONFIG_IPV6_ROUTE_INFO=y 43 64 CONFIG_INET6_AH=m 44 65 CONFIG_INET6_ESP=m 45 66 CONFIG_INET6_IPCOMP=m 46 - CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 47 - CONFIG_IPV6_TUNNEL=m 67 + CONFIG_IPV6_GRE=m 48 68 CONFIG_NETFILTER=y 49 - CONFIG_NETFILTER_NETLINK_QUEUE=m 50 69 CONFIG_NF_CONNTRACK=m 70 + CONFIG_NF_CONNTRACK_ZONES=y 71 + # CONFIG_NF_CONNTRACK_PROCFS is not set 51 72 # CONFIG_NF_CT_PROTO_DCCP is not set 52 73 CONFIG_NF_CT_PROTO_UDPLITE=m 53 74 CONFIG_NF_CONNTRACK_AMANDA=m ··· 76 55 CONFIG_NF_CONNTRACK_H323=m 77 56 CONFIG_NF_CONNTRACK_IRC=m 78 57 CONFIG_NF_CONNTRACK_NETBIOS_NS=m 58 + CONFIG_NF_CONNTRACK_SNMP=m 79 59 CONFIG_NF_CONNTRACK_PPTP=m 80 60 CONFIG_NF_CONNTRACK_SANE=m 81 61 CONFIG_NF_CONNTRACK_SIP=m 82 62 CONFIG_NF_CONNTRACK_TFTP=m 63 + CONFIG_NETFILTER_XT_SET=m 64 + CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 83 65 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 84 66 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 85 67 CONFIG_NETFILTER_XT_TARGET_DSCP=m 68 + CONFIG_NETFILTER_XT_TARGET_HMARK=m 69 + CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m 70 + CONFIG_NETFILTER_XT_TARGET_LOG=m 86 71 CONFIG_NETFILTER_XT_TARGET_MARK=m 87 72 CONFIG_NETFILTER_XT_TARGET_NFLOG=m 88 73 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 74 + CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 75 + CONFIG_NETFILTER_XT_TARGET_TEE=m 89 76 CONFIG_NETFILTER_XT_TARGET_TRACE=m 90 77 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 91 78 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 79 + CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m 80 + CONFIG_NETFILTER_XT_MATCH_BPF=m 92 81 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m 93 82 CONFIG_NETFILTER_XT_MATCH_COMMENT=m 94 83 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 84 + CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m 95 85 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 96 86 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 97 87 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 88 + CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m 98 89 CONFIG_NETFILTER_XT_MATCH_DSCP=m 99 90 CONFIG_NETFILTER_XT_MATCH_ESP=m 100 91 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m ··· 117 84 CONFIG_NETFILTER_XT_MATCH_MAC=m 118 85 CONFIG_NETFILTER_XT_MATCH_MARK=m 119 86 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 87 + CONFIG_NETFILTER_XT_MATCH_NFACCT=m 88 + CONFIG_NETFILTER_XT_MATCH_OSF=m 120 89 CONFIG_NETFILTER_XT_MATCH_OWNER=m 121 90 CONFIG_NETFILTER_XT_MATCH_POLICY=m 122 91 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m ··· 132 97 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 133 98 CONFIG_NETFILTER_XT_MATCH_TIME=m 134 99 CONFIG_NETFILTER_XT_MATCH_U32=m 100 + CONFIG_IP_SET=m 101 + CONFIG_IP_SET_BITMAP_IP=m 102 + CONFIG_IP_SET_BITMAP_IPMAC=m 103 + CONFIG_IP_SET_BITMAP_PORT=m 104 + CONFIG_IP_SET_HASH_IP=m 105 + CONFIG_IP_SET_HASH_IPPORT=m 106 + CONFIG_IP_SET_HASH_IPPORTIP=m 107 + CONFIG_IP_SET_HASH_IPPORTNET=m 108 + CONFIG_IP_SET_HASH_NET=m 109 + CONFIG_IP_SET_HASH_NETPORT=m 110 + CONFIG_IP_SET_HASH_NETIFACE=m 111 + CONFIG_IP_SET_LIST_SET=m 135 112 CONFIG_NF_CONNTRACK_IPV4=m 136 - CONFIG_IP_NF_QUEUE=m 137 113 CONFIG_IP_NF_IPTABLES=m 138 - CONFIG_IP_NF_MATCH_ADDRTYPE=m 139 114 CONFIG_IP_NF_MATCH_AH=m 140 115 CONFIG_IP_NF_MATCH_ECN=m 116 + CONFIG_IP_NF_MATCH_RPFILTER=m 141 117 CONFIG_IP_NF_MATCH_TTL=m 142 118 CONFIG_IP_NF_FILTER=m 143 119 CONFIG_IP_NF_TARGET_REJECT=m 144 - CONFIG_IP_NF_TARGET_LOG=m 145 120 CONFIG_IP_NF_TARGET_ULOG=m 146 - CONFIG_NF_NAT=m 121 + CONFIG_NF_NAT_IPV4=m 147 122 CONFIG_IP_NF_TARGET_MASQUERADE=m 148 123 CONFIG_IP_NF_TARGET_NETMAP=m 149 124 CONFIG_IP_NF_TARGET_REDIRECT=m 150 - CONFIG_NF_NAT_SNMP_BASIC=m 151 125 CONFIG_IP_NF_MANGLE=m 152 126 CONFIG_IP_NF_TARGET_CLUSTERIP=m 153 127 CONFIG_IP_NF_TARGET_ECN=m ··· 166 122 CONFIG_IP_NF_ARPFILTER=m 167 123 CONFIG_IP_NF_ARP_MANGLE=m 168 124 CONFIG_NF_CONNTRACK_IPV6=m 169 - CONFIG_IP6_NF_QUEUE=m 170 125 CONFIG_IP6_NF_IPTABLES=m 171 126 CONFIG_IP6_NF_MATCH_AH=m 172 127 CONFIG_IP6_NF_MATCH_EUI64=m ··· 174 131 CONFIG_IP6_NF_MATCH_HL=m 175 132 CONFIG_IP6_NF_MATCH_IPV6HEADER=m 176 133 CONFIG_IP6_NF_MATCH_MH=m 134 + CONFIG_IP6_NF_MATCH_RPFILTER=m 177 135 CONFIG_IP6_NF_MATCH_RT=m 178 136 CONFIG_IP6_NF_TARGET_HL=m 179 - CONFIG_IP6_NF_TARGET_LOG=m 180 137 CONFIG_IP6_NF_FILTER=m 181 138 CONFIG_IP6_NF_TARGET_REJECT=m 182 139 CONFIG_IP6_NF_MANGLE=m 183 140 CONFIG_IP6_NF_RAW=m 141 + CONFIG_NF_NAT_IPV6=m 142 + CONFIG_IP6_NF_TARGET_MASQUERADE=m 143 + CONFIG_IP6_NF_TARGET_NPT=m 184 144 CONFIG_IP_DCCP=m 185 145 # CONFIG_IP_DCCP_CCID3 is not set 146 + CONFIG_SCTP_COOKIE_HMAC_SHA1=y 147 + CONFIG_RDS=m 148 + CONFIG_RDS_TCP=m 149 + CONFIG_L2TP=m 186 150 CONFIG_ATALK=m 151 + CONFIG_BATMAN_ADV=m 152 + CONFIG_BATMAN_ADV_DAT=y 153 + # CONFIG_WIRELESS is not set 187 154 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 155 + CONFIG_DEVTMPFS=y 188 156 # CONFIG_FIRMWARE_IN_KERNEL is not set 157 + # CONFIG_FW_LOADER_USER_HELPER is not set 189 158 CONFIG_CONNECTOR=m 190 159 CONFIG_BLK_DEV_LOOP=y 191 160 CONFIG_BLK_DEV_CRYPTOLOOP=m 161 + CONFIG_BLK_DEV_DRBD=m 192 162 CONFIG_BLK_DEV_NBD=m 193 163 CONFIG_BLK_DEV_RAM=y 194 164 CONFIG_CDROM_PKTCDVD=m ··· 216 160 CONFIG_BLK_DEV_SR_VENDOR=y 217 161 CONFIG_CHR_DEV_SG=m 218 162 CONFIG_SCSI_CONSTANTS=y 219 - CONFIG_SCSI_SAS_LIBSAS=m 220 - # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set 221 - CONFIG_SCSI_SRP_ATTRS=m 222 - CONFIG_SCSI_SRP_TGT_ATTRS=y 163 + CONFIG_SCSI_SAS_ATTRS=m 223 164 CONFIG_ISCSI_TCP=m 165 + CONFIG_ISCSI_BOOT_SYSFS=m 224 166 CONFIG_MVME16x_SCSI=y 225 167 CONFIG_MD=y 226 - CONFIG_BLK_DEV_MD=m 227 168 CONFIG_MD_LINEAR=m 228 169 CONFIG_MD_RAID0=m 229 - CONFIG_MD_RAID1=m 230 - CONFIG_MD_RAID456=m 231 170 CONFIG_BLK_DEV_DM=m 232 171 CONFIG_DM_CRYPT=m 233 172 CONFIG_DM_SNAPSHOT=m 173 + CONFIG_DM_THIN_PROVISIONING=m 174 + CONFIG_DM_CACHE=m 234 175 CONFIG_DM_MIRROR=m 176 + CONFIG_DM_RAID=m 235 177 CONFIG_DM_ZERO=m 236 178 CONFIG_DM_MULTIPATH=m 237 179 CONFIG_DM_UEVENT=y 180 + CONFIG_TARGET_CORE=m 181 + CONFIG_TCM_IBLOCK=m 182 + CONFIG_TCM_FILEIO=m 183 + CONFIG_TCM_PSCSI=m 238 184 CONFIG_NETDEVICES=y 239 185 CONFIG_DUMMY=m 240 - CONFIG_MACVLAN=m 241 186 CONFIG_EQUALIZER=m 187 + CONFIG_NET_TEAM=m 188 + CONFIG_NET_TEAM_MODE_BROADCAST=m 189 + CONFIG_NET_TEAM_MODE_ROUNDROBIN=m 190 + CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 191 + CONFIG_NET_TEAM_MODE_LOADBALANCE=m 192 + CONFIG_VXLAN=m 193 + CONFIG_NETCONSOLE=m 194 + CONFIG_NETCONSOLE_DYNAMIC=y 242 195 CONFIG_VETH=m 243 - CONFIG_NET_ETHERNET=y 196 + # CONFIG_NET_CADENCE is not set 197 + # CONFIG_NET_VENDOR_BROADCOM is not set 244 198 CONFIG_MVME16x_NET=y 245 - # CONFIG_NETDEV_1000 is not set 246 - # CONFIG_NETDEV_10000 is not set 199 + # CONFIG_NET_VENDOR_MARVELL is not set 200 + # CONFIG_NET_VENDOR_MICREL is not set 201 + # CONFIG_NET_VENDOR_NATSEMI is not set 202 + # CONFIG_NET_VENDOR_SEEQ is not set 203 + # CONFIG_NET_VENDOR_STMICRO is not set 204 + # CONFIG_NET_VENDOR_WIZNET is not set 247 205 CONFIG_PPP=m 248 - CONFIG_PPP_FILTER=y 249 - CONFIG_PPP_ASYNC=m 250 - CONFIG_PPP_SYNC_TTY=m 251 - CONFIG_PPP_DEFLATE=m 252 206 CONFIG_PPP_BSDCOMP=m 207 + CONFIG_PPP_DEFLATE=m 208 + CONFIG_PPP_FILTER=y 253 209 CONFIG_PPP_MPPE=m 254 210 CONFIG_PPPOE=m 211 + CONFIG_PPTP=m 212 + CONFIG_PPPOL2TP=m 213 + CONFIG_PPP_ASYNC=m 214 + CONFIG_PPP_SYNC_TTY=m 255 215 CONFIG_SLIP=m 256 216 CONFIG_SLIP_COMPRESSED=y 257 217 CONFIG_SLIP_SMART=y 258 218 CONFIG_SLIP_MODE_SLIP6=y 259 - CONFIG_NETCONSOLE=m 260 - CONFIG_NETCONSOLE_DYNAMIC=y 261 - CONFIG_INPUT_FF_MEMLESS=m 219 + # CONFIG_WLAN is not set 220 + CONFIG_INPUT_EVDEV=m 262 221 # CONFIG_KEYBOARD_ATKBD is not set 263 - CONFIG_MOUSE_PS2=m 264 - CONFIG_MOUSE_SERIAL=m 265 - CONFIG_SERIO=m 266 - # CONFIG_SERIO_SERPORT is not set 222 + # CONFIG_MOUSE_PS2 is not set 223 + # CONFIG_SERIO is not set 267 224 CONFIG_VT_HW_CONSOLE_BINDING=y 225 + # CONFIG_LEGACY_PTYS is not set 268 226 # CONFIG_DEVKMEM is not set 269 227 # CONFIG_HW_RANDOM is not set 270 - CONFIG_GEN_RTC=m 271 - CONFIG_GEN_RTC_X=y 228 + CONFIG_NTP_PPS=y 229 + CONFIG_PPS_CLIENT_LDISC=m 230 + CONFIG_PTP_1588_CLOCK=m 272 231 # CONFIG_HWMON is not set 273 232 CONFIG_HID=m 274 233 CONFIG_HIDRAW=y 234 + CONFIG_UHID=m 235 + # CONFIG_HID_GENERIC is not set 275 236 # CONFIG_USB_SUPPORT is not set 237 + CONFIG_RTC_CLASS=y 238 + CONFIG_RTC_DRV_GENERIC=m 239 + # CONFIG_IOMMU_SUPPORT is not set 240 + CONFIG_PROC_HARDWARE=y 276 241 CONFIG_EXT2_FS=y 277 242 CONFIG_EXT3_FS=y 278 243 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 279 244 # CONFIG_EXT3_FS_XATTR is not set 245 + CONFIG_EXT4_FS=y 280 246 CONFIG_REISERFS_FS=m 281 247 CONFIG_JFS_FS=m 282 248 CONFIG_XFS_FS=m 283 249 CONFIG_OCFS2_FS=m 284 - # CONFIG_OCFS2_FS_STATS is not set 285 250 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 251 + CONFIG_FANOTIFY=y 286 252 CONFIG_QUOTA_NETLINK_INTERFACE=y 287 253 # CONFIG_PRINT_QUOTA_WARNING is not set 288 - CONFIG_AUTOFS_FS=m 289 254 CONFIG_AUTOFS4_FS=m 290 255 CONFIG_FUSE_FS=m 256 + CONFIG_CUSE=m 291 257 CONFIG_ISO9660_FS=y 292 258 CONFIG_JOLIET=y 293 259 CONFIG_ZISOFS=y 294 260 CONFIG_UDF_FS=m 295 - CONFIG_MSDOS_FS=y 261 + CONFIG_MSDOS_FS=m 296 262 CONFIG_VFAT_FS=m 297 263 CONFIG_PROC_KCORE=y 298 264 CONFIG_TMPFS=y 299 265 CONFIG_AFFS_FS=m 266 + CONFIG_ECRYPT_FS=m 267 + CONFIG_ECRYPT_FS_MESSAGING=y 300 268 CONFIG_HFS_FS=m 301 269 CONFIG_HFSPLUS_FS=m 302 270 CONFIG_CRAMFS=m 303 271 CONFIG_SQUASHFS=m 304 - CONFIG_MINIX_FS=y 272 + CONFIG_SQUASHFS_LZO=y 273 + CONFIG_MINIX_FS=m 274 + CONFIG_OMFS_FS=m 305 275 CONFIG_HPFS_FS=m 276 + CONFIG_QNX4FS_FS=m 277 + CONFIG_QNX6FS_FS=m 306 278 CONFIG_SYSV_FS=m 307 279 CONFIG_UFS_FS=m 308 280 CONFIG_NFS_FS=y 309 - CONFIG_NFS_V3=y 310 281 CONFIG_NFS_V4=y 282 + CONFIG_NFS_SWAP=y 311 283 CONFIG_ROOT_NFS=y 312 284 CONFIG_NFSD=m 313 285 CONFIG_NFSD_V3=y 314 - CONFIG_SMB_FS=m 315 - CONFIG_SMB_NLS_DEFAULT=y 286 + CONFIG_CIFS=m 287 + # CONFIG_CIFS_DEBUG is not set 316 288 CONFIG_CODA_FS=m 317 289 CONFIG_NLS_CODEPAGE_437=y 318 290 CONFIG_NLS_CODEPAGE_737=m ··· 379 295 CONFIG_NLS_ISO8859_15=m 380 296 CONFIG_NLS_KOI8_R=m 381 297 CONFIG_NLS_KOI8_U=m 298 + CONFIG_NLS_MAC_ROMAN=m 299 + CONFIG_NLS_MAC_CELTIC=m 300 + CONFIG_NLS_MAC_CENTEURO=m 301 + CONFIG_NLS_MAC_CROATIAN=m 302 + CONFIG_NLS_MAC_CYRILLIC=m 303 + CONFIG_NLS_MAC_GAELIC=m 304 + CONFIG_NLS_MAC_GREEK=m 305 + CONFIG_NLS_MAC_ICELAND=m 306 + CONFIG_NLS_MAC_INUIT=m 307 + CONFIG_NLS_MAC_ROMANIAN=m 308 + CONFIG_NLS_MAC_TURKISH=m 382 309 CONFIG_DLM=m 383 310 CONFIG_MAGIC_SYSRQ=y 384 - # CONFIG_RCU_CPU_STALL_DETECTOR is not set 385 - CONFIG_SYSCTL_SYSCALL_CHECK=y 311 + CONFIG_ASYNC_RAID6_TEST=m 312 + CONFIG_ENCRYPTED_KEYS=m 313 + CONFIG_CRYPTO_MANAGER=y 314 + CONFIG_CRYPTO_USER=m 386 315 CONFIG_CRYPTO_NULL=m 387 316 CONFIG_CRYPTO_CRYPTD=m 388 317 CONFIG_CRYPTO_TEST=m ··· 405 308 CONFIG_CRYPTO_LRW=m 406 309 CONFIG_CRYPTO_PCBC=m 407 310 CONFIG_CRYPTO_XTS=m 408 - CONFIG_CRYPTO_HMAC=y 409 311 CONFIG_CRYPTO_XCBC=m 410 - CONFIG_CRYPTO_MD4=m 312 + CONFIG_CRYPTO_VMAC=m 411 313 CONFIG_CRYPTO_MICHAEL_MIC=m 412 314 CONFIG_CRYPTO_RMD128=m 413 315 CONFIG_CRYPTO_RMD160=m 414 316 CONFIG_CRYPTO_RMD256=m 415 317 CONFIG_CRYPTO_RMD320=m 416 - CONFIG_CRYPTO_SHA256=m 417 318 CONFIG_CRYPTO_SHA512=m 418 319 CONFIG_CRYPTO_TGR192=m 419 320 CONFIG_CRYPTO_WP512=m 420 - CONFIG_CRYPTO_AES=m 421 321 CONFIG_CRYPTO_ANUBIS=m 422 322 CONFIG_CRYPTO_BLOWFISH=m 423 323 CONFIG_CRYPTO_CAMELLIA=m ··· 430 336 CONFIG_CRYPTO_ZLIB=m 431 337 CONFIG_CRYPTO_LZO=m 432 338 # CONFIG_CRYPTO_ANSI_CPRNG is not set 339 + CONFIG_CRYPTO_USER_API_HASH=m 340 + CONFIG_CRYPTO_USER_API_SKCIPHER=m 433 341 # CONFIG_CRYPTO_HW is not set 434 - CONFIG_CRC16=m 435 342 CONFIG_CRC_T10DIF=y 343 + CONFIG_XZ_DEC_X86=y 344 + CONFIG_XZ_DEC_POWERPC=y 345 + CONFIG_XZ_DEC_IA64=y 346 + CONFIG_XZ_DEC_ARM=y 347 + CONFIG_XZ_DEC_ARMTHUMB=y 348 + CONFIG_XZ_DEC_SPARC=y 349 + CONFIG_XZ_DEC_TEST=m
+172 -57
arch/m68k/configs/q40_defconfig
··· 1 - CONFIG_EXPERIMENTAL=y 2 1 CONFIG_LOCALVERSION="-q40" 3 2 CONFIG_SYSVIPC=y 4 3 CONFIG_POSIX_MQUEUE=y 4 + CONFIG_FHANDLE=y 5 5 CONFIG_BSD_PROCESS_ACCT=y 6 - CONFIG_LOG_BUF_SHIFT=14 7 - CONFIG_RELAY=y 6 + CONFIG_BSD_PROCESS_ACCT_V3=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 12 CONFIG_BLK_DEV_INITRD=y 9 - # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 10 13 CONFIG_SLAB=y 11 14 CONFIG_MODULES=y 12 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 28 CONFIG_M68040=y 15 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 34 CONFIG_BINFMT_AOUT=m 17 35 CONFIG_BINFMT_MISC=m 18 - CONFIG_HEARTBEAT=y 19 - CONFIG_PROC_HARDWARE=y 20 36 CONFIG_NET=y 21 37 CONFIG_PACKET=y 38 + CONFIG_PACKET_DIAG=m 22 39 CONFIG_UNIX=y 40 + CONFIG_UNIX_DIAG=m 41 + CONFIG_XFRM_MIGRATE=y 23 42 CONFIG_NET_KEY=y 24 - CONFIG_NET_KEY_MIGRATE=y 25 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 48 CONFIG_NET_IPIP=m 49 + CONFIG_NET_IPGRE_DEMUX=m 27 50 CONFIG_NET_IPGRE=m 28 51 CONFIG_SYN_COOKIES=y 52 + CONFIG_NET_IPVTI=m 29 53 CONFIG_INET_AH=m 30 54 CONFIG_INET_ESP=m 31 55 CONFIG_INET_IPCOMP=m 32 56 CONFIG_INET_XFRM_MODE_TRANSPORT=m 33 57 CONFIG_INET_XFRM_MODE_TUNNEL=m 34 58 CONFIG_INET_XFRM_MODE_BEET=m 59 + # CONFIG_INET_LRO is not set 35 60 CONFIG_INET_DIAG=m 61 + CONFIG_INET_UDP_DIAG=m 36 62 CONFIG_IPV6_PRIVACY=y 37 63 CONFIG_IPV6_ROUTER_PREF=y 38 - CONFIG_IPV6_ROUTE_INFO=y 39 64 CONFIG_INET6_AH=m 40 65 CONFIG_INET6_ESP=m 41 66 CONFIG_INET6_IPCOMP=m 42 - CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 43 - CONFIG_IPV6_TUNNEL=m 67 + CONFIG_IPV6_GRE=m 44 68 CONFIG_NETFILTER=y 45 - CONFIG_NETFILTER_NETLINK_QUEUE=m 46 69 CONFIG_NF_CONNTRACK=m 70 + CONFIG_NF_CONNTRACK_ZONES=y 71 + # CONFIG_NF_CONNTRACK_PROCFS is not set 47 72 # CONFIG_NF_CT_PROTO_DCCP is not set 48 73 CONFIG_NF_CT_PROTO_UDPLITE=m 49 74 CONFIG_NF_CONNTRACK_AMANDA=m ··· 76 51 CONFIG_NF_CONNTRACK_H323=m 77 52 CONFIG_NF_CONNTRACK_IRC=m 78 53 CONFIG_NF_CONNTRACK_NETBIOS_NS=m 54 + CONFIG_NF_CONNTRACK_SNMP=m 79 55 CONFIG_NF_CONNTRACK_PPTP=m 80 56 CONFIG_NF_CONNTRACK_SANE=m 81 57 CONFIG_NF_CONNTRACK_SIP=m 82 58 CONFIG_NF_CONNTRACK_TFTP=m 59 + CONFIG_NETFILTER_XT_SET=m 60 + CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 83 61 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 84 62 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 85 63 CONFIG_NETFILTER_XT_TARGET_DSCP=m 64 + CONFIG_NETFILTER_XT_TARGET_HMARK=m 65 + CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m 66 + CONFIG_NETFILTER_XT_TARGET_LOG=m 86 67 CONFIG_NETFILTER_XT_TARGET_MARK=m 87 68 CONFIG_NETFILTER_XT_TARGET_NFLOG=m 88 69 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 70 + CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 71 + CONFIG_NETFILTER_XT_TARGET_TEE=m 89 72 CONFIG_NETFILTER_XT_TARGET_TRACE=m 90 73 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 91 74 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 75 + CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m 76 + CONFIG_NETFILTER_XT_MATCH_BPF=m 92 77 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m 93 78 CONFIG_NETFILTER_XT_MATCH_COMMENT=m 94 79 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 80 + CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m 95 81 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 96 82 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 97 83 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 84 + CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m 98 85 CONFIG_NETFILTER_XT_MATCH_DSCP=m 99 86 CONFIG_NETFILTER_XT_MATCH_ESP=m 100 87 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m ··· 117 80 CONFIG_NETFILTER_XT_MATCH_MAC=m 118 81 CONFIG_NETFILTER_XT_MATCH_MARK=m 119 82 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 83 + CONFIG_NETFILTER_XT_MATCH_NFACCT=m 84 + CONFIG_NETFILTER_XT_MATCH_OSF=m 120 85 CONFIG_NETFILTER_XT_MATCH_OWNER=m 121 86 CONFIG_NETFILTER_XT_MATCH_POLICY=m 122 87 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m ··· 132 93 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 133 94 CONFIG_NETFILTER_XT_MATCH_TIME=m 134 95 CONFIG_NETFILTER_XT_MATCH_U32=m 96 + CONFIG_IP_SET=m 97 + CONFIG_IP_SET_BITMAP_IP=m 98 + CONFIG_IP_SET_BITMAP_IPMAC=m 99 + CONFIG_IP_SET_BITMAP_PORT=m 100 + CONFIG_IP_SET_HASH_IP=m 101 + CONFIG_IP_SET_HASH_IPPORT=m 102 + CONFIG_IP_SET_HASH_IPPORTIP=m 103 + CONFIG_IP_SET_HASH_IPPORTNET=m 104 + CONFIG_IP_SET_HASH_NET=m 105 + CONFIG_IP_SET_HASH_NETPORT=m 106 + CONFIG_IP_SET_HASH_NETIFACE=m 107 + CONFIG_IP_SET_LIST_SET=m 135 108 CONFIG_NF_CONNTRACK_IPV4=m 136 - CONFIG_IP_NF_QUEUE=m 137 109 CONFIG_IP_NF_IPTABLES=m 138 - CONFIG_IP_NF_MATCH_ADDRTYPE=m 139 110 CONFIG_IP_NF_MATCH_AH=m 140 111 CONFIG_IP_NF_MATCH_ECN=m 112 + CONFIG_IP_NF_MATCH_RPFILTER=m 141 113 CONFIG_IP_NF_MATCH_TTL=m 142 114 CONFIG_IP_NF_FILTER=m 143 115 CONFIG_IP_NF_TARGET_REJECT=m 144 - CONFIG_IP_NF_TARGET_LOG=m 145 116 CONFIG_IP_NF_TARGET_ULOG=m 146 - CONFIG_NF_NAT=m 117 + CONFIG_NF_NAT_IPV4=m 147 118 CONFIG_IP_NF_TARGET_MASQUERADE=m 148 119 CONFIG_IP_NF_TARGET_NETMAP=m 149 120 CONFIG_IP_NF_TARGET_REDIRECT=m 150 - CONFIG_NF_NAT_SNMP_BASIC=m 151 121 CONFIG_IP_NF_MANGLE=m 152 122 CONFIG_IP_NF_TARGET_CLUSTERIP=m 153 123 CONFIG_IP_NF_TARGET_ECN=m ··· 166 118 CONFIG_IP_NF_ARPFILTER=m 167 119 CONFIG_IP_NF_ARP_MANGLE=m 168 120 CONFIG_NF_CONNTRACK_IPV6=m 169 - CONFIG_IP6_NF_QUEUE=m 170 121 CONFIG_IP6_NF_IPTABLES=m 171 122 CONFIG_IP6_NF_MATCH_AH=m 172 123 CONFIG_IP6_NF_MATCH_EUI64=m ··· 174 127 CONFIG_IP6_NF_MATCH_HL=m 175 128 CONFIG_IP6_NF_MATCH_IPV6HEADER=m 176 129 CONFIG_IP6_NF_MATCH_MH=m 130 + CONFIG_IP6_NF_MATCH_RPFILTER=m 177 131 CONFIG_IP6_NF_MATCH_RT=m 178 132 CONFIG_IP6_NF_TARGET_HL=m 179 - CONFIG_IP6_NF_TARGET_LOG=m 180 133 CONFIG_IP6_NF_FILTER=m 181 134 CONFIG_IP6_NF_TARGET_REJECT=m 182 135 CONFIG_IP6_NF_MANGLE=m 183 136 CONFIG_IP6_NF_RAW=m 137 + CONFIG_NF_NAT_IPV6=m 138 + CONFIG_IP6_NF_TARGET_MASQUERADE=m 139 + CONFIG_IP6_NF_TARGET_NPT=m 184 140 CONFIG_IP_DCCP=m 185 141 # CONFIG_IP_DCCP_CCID3 is not set 142 + CONFIG_SCTP_COOKIE_HMAC_SHA1=y 143 + CONFIG_RDS=m 144 + CONFIG_RDS_TCP=m 145 + CONFIG_L2TP=m 186 146 CONFIG_ATALK=m 147 + CONFIG_BATMAN_ADV=m 148 + CONFIG_BATMAN_ADV_DAT=y 149 + # CONFIG_WIRELESS is not set 187 150 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 151 + CONFIG_DEVTMPFS=y 188 152 # CONFIG_FIRMWARE_IN_KERNEL is not set 153 + # CONFIG_FW_LOADER_USER_HELPER is not set 189 154 CONFIG_CONNECTOR=m 190 155 CONFIG_BLK_DEV_LOOP=y 191 156 CONFIG_BLK_DEV_CRYPTOLOOP=m 157 + CONFIG_BLK_DEV_DRBD=m 192 158 CONFIG_BLK_DEV_NBD=m 193 159 CONFIG_BLK_DEV_RAM=y 194 160 CONFIG_CDROM_PKTCDVD=m 195 161 CONFIG_ATA_OVER_ETH=m 196 162 CONFIG_IDE=y 163 + CONFIG_IDE_GD_ATAPI=y 197 164 CONFIG_BLK_DEV_IDECD=y 198 165 CONFIG_BLK_DEV_Q40IDE=y 199 166 CONFIG_RAID_ATTRS=m ··· 220 159 CONFIG_BLK_DEV_SR_VENDOR=y 221 160 CONFIG_CHR_DEV_SG=m 222 161 CONFIG_SCSI_CONSTANTS=y 223 - CONFIG_SCSI_SAS_LIBSAS=m 224 - # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set 225 - CONFIG_SCSI_SRP_ATTRS=m 226 - CONFIG_SCSI_SRP_TGT_ATTRS=y 162 + CONFIG_SCSI_SAS_ATTRS=m 227 163 CONFIG_ISCSI_TCP=m 164 + CONFIG_ISCSI_BOOT_SYSFS=m 228 165 CONFIG_MD=y 229 - CONFIG_BLK_DEV_MD=m 230 166 CONFIG_MD_LINEAR=m 231 167 CONFIG_MD_RAID0=m 232 - CONFIG_MD_RAID1=m 233 - CONFIG_MD_RAID456=m 234 168 CONFIG_BLK_DEV_DM=m 235 169 CONFIG_DM_CRYPT=m 236 170 CONFIG_DM_SNAPSHOT=m 171 + CONFIG_DM_THIN_PROVISIONING=m 172 + CONFIG_DM_CACHE=m 237 173 CONFIG_DM_MIRROR=m 174 + CONFIG_DM_RAID=m 238 175 CONFIG_DM_ZERO=m 239 176 CONFIG_DM_MULTIPATH=m 240 177 CONFIG_DM_UEVENT=y 178 + CONFIG_TARGET_CORE=m 179 + CONFIG_TCM_IBLOCK=m 180 + CONFIG_TCM_FILEIO=m 181 + CONFIG_TCM_PSCSI=m 241 182 CONFIG_NETDEVICES=y 242 183 CONFIG_DUMMY=m 243 - CONFIG_MACVLAN=m 244 184 CONFIG_EQUALIZER=m 185 + CONFIG_NET_TEAM=m 186 + CONFIG_NET_TEAM_MODE_BROADCAST=m 187 + CONFIG_NET_TEAM_MODE_ROUNDROBIN=m 188 + CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 189 + CONFIG_NET_TEAM_MODE_LOADBALANCE=m 190 + CONFIG_VXLAN=m 191 + CONFIG_NETCONSOLE=m 192 + CONFIG_NETCONSOLE_DYNAMIC=y 245 193 CONFIG_VETH=m 246 - CONFIG_NET_ETHERNET=y 194 + # CONFIG_NET_VENDOR_3COM is not set 195 + # CONFIG_NET_VENDOR_AMD is not set 196 + # CONFIG_NET_CADENCE is not set 197 + # CONFIG_NET_VENDOR_BROADCOM is not set 198 + # CONFIG_NET_VENDOR_CIRRUS is not set 199 + # CONFIG_NET_VENDOR_FUJITSU is not set 200 + # CONFIG_NET_VENDOR_HP is not set 201 + # CONFIG_NET_VENDOR_INTEL is not set 202 + # CONFIG_NET_VENDOR_MARVELL is not set 203 + # CONFIG_NET_VENDOR_MICREL is not set 247 204 CONFIG_NE2000=m 248 - # CONFIG_NETDEV_1000 is not set 249 - # CONFIG_NETDEV_10000 is not set 205 + # CONFIG_NET_VENDOR_SEEQ is not set 206 + # CONFIG_NET_VENDOR_SMSC is not set 207 + # CONFIG_NET_VENDOR_STMICRO is not set 208 + # CONFIG_NET_VENDOR_WIZNET is not set 250 209 CONFIG_PPP=m 251 - CONFIG_PPP_FILTER=y 252 - CONFIG_PPP_ASYNC=m 253 - CONFIG_PPP_SYNC_TTY=m 254 - CONFIG_PPP_DEFLATE=m 255 210 CONFIG_PPP_BSDCOMP=m 211 + CONFIG_PPP_DEFLATE=m 212 + CONFIG_PPP_FILTER=y 256 213 CONFIG_PPP_MPPE=m 257 214 CONFIG_PPPOE=m 215 + CONFIG_PPTP=m 216 + CONFIG_PPPOL2TP=m 217 + CONFIG_PPP_ASYNC=m 218 + CONFIG_PPP_SYNC_TTY=m 258 219 CONFIG_SLIP=m 259 220 CONFIG_SLIP_COMPRESSED=y 260 221 CONFIG_SLIP_SMART=y 261 222 CONFIG_SLIP_MODE_SLIP6=y 262 - CONFIG_NETCONSOLE=m 263 - CONFIG_NETCONSOLE_DYNAMIC=y 264 - CONFIG_INPUT_FF_MEMLESS=m 223 + # CONFIG_WLAN is not set 224 + CONFIG_INPUT_EVDEV=m 265 225 # CONFIG_KEYBOARD_ATKBD is not set 266 - CONFIG_MOUSE_PS2=m 226 + # CONFIG_MOUSE_PS2 is not set 267 227 CONFIG_MOUSE_SERIAL=m 268 228 CONFIG_INPUT_MISC=y 269 229 CONFIG_INPUT_M68K_BEEP=m 270 - CONFIG_SERIO=m 271 - # CONFIG_SERIO_SERPORT is not set 272 - CONFIG_SERIO_Q40KBD=m 230 + CONFIG_SERIO_Q40KBD=y 273 231 CONFIG_VT_HW_CONSOLE_BINDING=y 232 + # CONFIG_LEGACY_PTYS is not set 274 233 # CONFIG_DEVKMEM is not set 275 234 # CONFIG_HW_RANDOM is not set 276 - CONFIG_GEN_RTC=m 277 - CONFIG_GEN_RTC_X=y 235 + CONFIG_NTP_PPS=y 236 + CONFIG_PPS_CLIENT_LDISC=m 237 + CONFIG_PTP_1588_CLOCK=m 278 238 # CONFIG_HWMON is not set 279 239 CONFIG_FB=y 280 240 CONFIG_FRAMEBUFFER_CONSOLE=y ··· 304 222 CONFIG_DMASOUND_Q40=m 305 223 CONFIG_HID=m 306 224 CONFIG_HIDRAW=y 225 + CONFIG_UHID=m 226 + # CONFIG_HID_GENERIC is not set 307 227 # CONFIG_USB_SUPPORT is not set 228 + CONFIG_RTC_CLASS=y 229 + CONFIG_RTC_DRV_GENERIC=m 230 + # CONFIG_IOMMU_SUPPORT is not set 231 + CONFIG_HEARTBEAT=y 232 + CONFIG_PROC_HARDWARE=y 308 233 CONFIG_EXT2_FS=y 309 234 CONFIG_EXT3_FS=y 310 235 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 311 236 # CONFIG_EXT3_FS_XATTR is not set 237 + CONFIG_EXT4_FS=y 312 238 CONFIG_REISERFS_FS=m 313 239 CONFIG_JFS_FS=m 314 240 CONFIG_XFS_FS=m 315 241 CONFIG_OCFS2_FS=m 316 - # CONFIG_OCFS2_FS_STATS is not set 317 242 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 243 + CONFIG_FANOTIFY=y 318 244 CONFIG_QUOTA_NETLINK_INTERFACE=y 319 245 # CONFIG_PRINT_QUOTA_WARNING is not set 320 - CONFIG_AUTOFS_FS=m 321 246 CONFIG_AUTOFS4_FS=m 322 247 CONFIG_FUSE_FS=m 248 + CONFIG_CUSE=m 323 249 CONFIG_ISO9660_FS=y 324 250 CONFIG_JOLIET=y 325 251 CONFIG_ZISOFS=y 326 252 CONFIG_UDF_FS=m 327 - CONFIG_MSDOS_FS=y 253 + CONFIG_MSDOS_FS=m 328 254 CONFIG_VFAT_FS=m 329 255 CONFIG_PROC_KCORE=y 330 256 CONFIG_TMPFS=y 331 257 CONFIG_AFFS_FS=m 258 + CONFIG_ECRYPT_FS=m 259 + CONFIG_ECRYPT_FS_MESSAGING=y 332 260 CONFIG_HFS_FS=m 333 261 CONFIG_HFSPLUS_FS=m 334 262 CONFIG_CRAMFS=m 335 263 CONFIG_SQUASHFS=m 336 - CONFIG_MINIX_FS=y 264 + CONFIG_SQUASHFS_LZO=y 265 + CONFIG_MINIX_FS=m 266 + CONFIG_OMFS_FS=m 337 267 CONFIG_HPFS_FS=m 268 + CONFIG_QNX4FS_FS=m 269 + CONFIG_QNX6FS_FS=m 338 270 CONFIG_SYSV_FS=m 339 271 CONFIG_UFS_FS=m 340 272 CONFIG_NFS_FS=y 341 - CONFIG_NFS_V3=y 342 273 CONFIG_NFS_V4=y 274 + CONFIG_NFS_SWAP=y 275 + CONFIG_ROOT_NFS=y 343 276 CONFIG_NFSD=m 344 277 CONFIG_NFSD_V3=y 345 - CONFIG_SMB_FS=m 346 - CONFIG_SMB_NLS_DEFAULT=y 278 + CONFIG_CIFS=m 279 + # CONFIG_CIFS_DEBUG is not set 347 280 CONFIG_CODA_FS=m 348 281 CONFIG_NLS_CODEPAGE_437=y 349 282 CONFIG_NLS_CODEPAGE_737=m ··· 397 300 CONFIG_NLS_ISO8859_15=m 398 301 CONFIG_NLS_KOI8_R=m 399 302 CONFIG_NLS_KOI8_U=m 303 + CONFIG_NLS_MAC_ROMAN=m 304 + CONFIG_NLS_MAC_CELTIC=m 305 + CONFIG_NLS_MAC_CENTEURO=m 306 + CONFIG_NLS_MAC_CROATIAN=m 307 + CONFIG_NLS_MAC_CYRILLIC=m 308 + CONFIG_NLS_MAC_GAELIC=m 309 + CONFIG_NLS_MAC_GREEK=m 310 + CONFIG_NLS_MAC_ICELAND=m 311 + CONFIG_NLS_MAC_INUIT=m 312 + CONFIG_NLS_MAC_ROMANIAN=m 313 + CONFIG_NLS_MAC_TURKISH=m 400 314 CONFIG_DLM=m 401 315 CONFIG_MAGIC_SYSRQ=y 402 - # CONFIG_RCU_CPU_STALL_DETECTOR is not set 403 - CONFIG_SYSCTL_SYSCALL_CHECK=y 316 + CONFIG_ASYNC_RAID6_TEST=m 317 + CONFIG_ENCRYPTED_KEYS=m 318 + CONFIG_CRYPTO_MANAGER=y 319 + CONFIG_CRYPTO_USER=m 404 320 CONFIG_CRYPTO_NULL=m 405 321 CONFIG_CRYPTO_CRYPTD=m 406 322 CONFIG_CRYPTO_TEST=m ··· 423 313 CONFIG_CRYPTO_LRW=m 424 314 CONFIG_CRYPTO_PCBC=m 425 315 CONFIG_CRYPTO_XTS=m 426 - CONFIG_CRYPTO_HMAC=y 427 316 CONFIG_CRYPTO_XCBC=m 428 - CONFIG_CRYPTO_MD4=m 317 + CONFIG_CRYPTO_VMAC=m 429 318 CONFIG_CRYPTO_MICHAEL_MIC=m 430 319 CONFIG_CRYPTO_RMD128=m 431 320 CONFIG_CRYPTO_RMD160=m 432 321 CONFIG_CRYPTO_RMD256=m 433 322 CONFIG_CRYPTO_RMD320=m 434 - CONFIG_CRYPTO_SHA256=m 435 323 CONFIG_CRYPTO_SHA512=m 436 324 CONFIG_CRYPTO_TGR192=m 437 325 CONFIG_CRYPTO_WP512=m 438 - CONFIG_CRYPTO_AES=m 439 326 CONFIG_CRYPTO_ANUBIS=m 440 327 CONFIG_CRYPTO_BLOWFISH=m 441 328 CONFIG_CRYPTO_CAMELLIA=m ··· 448 341 CONFIG_CRYPTO_ZLIB=m 449 342 CONFIG_CRYPTO_LZO=m 450 343 # CONFIG_CRYPTO_ANSI_CPRNG is not set 344 + CONFIG_CRYPTO_USER_API_HASH=m 345 + CONFIG_CRYPTO_USER_API_SKCIPHER=m 451 346 # CONFIG_CRYPTO_HW is not set 452 - CONFIG_CRC16=m 453 347 CONFIG_CRC_T10DIF=y 348 + CONFIG_XZ_DEC_X86=y 349 + CONFIG_XZ_DEC_POWERPC=y 350 + CONFIG_XZ_DEC_IA64=y 351 + CONFIG_XZ_DEC_ARM=y 352 + CONFIG_XZ_DEC_ARMTHUMB=y 353 + CONFIG_XZ_DEC_SPARC=y 354 + CONFIG_XZ_DEC_TEST=m
+156 -53
arch/m68k/configs/sun3_defconfig
··· 1 - CONFIG_EXPERIMENTAL=y 2 1 CONFIG_LOCALVERSION="-sun3" 3 2 CONFIG_SYSVIPC=y 4 3 CONFIG_POSIX_MQUEUE=y 4 + CONFIG_FHANDLE=y 5 5 CONFIG_BSD_PROCESS_ACCT=y 6 - CONFIG_LOG_BUF_SHIFT=14 7 - CONFIG_RELAY=y 6 + CONFIG_BSD_PROCESS_ACCT_V3=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 12 CONFIG_BLK_DEV_INITRD=y 9 - # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 10 13 CONFIG_SLAB=y 11 14 CONFIG_MODULES=y 12 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 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 31 CONFIG_BINFMT_AOUT=m 15 32 CONFIG_BINFMT_MISC=m 16 - CONFIG_PROC_HARDWARE=y 17 33 CONFIG_NET=y 18 34 CONFIG_PACKET=y 35 + CONFIG_PACKET_DIAG=m 19 36 CONFIG_UNIX=y 37 + CONFIG_UNIX_DIAG=m 38 + CONFIG_XFRM_MIGRATE=y 20 39 CONFIG_NET_KEY=y 21 - CONFIG_NET_KEY_MIGRATE=y 22 40 CONFIG_INET=y 23 41 CONFIG_IP_PNP=y 24 42 CONFIG_IP_PNP_DHCP=y 25 43 CONFIG_IP_PNP_BOOTP=y 26 44 CONFIG_IP_PNP_RARP=y 27 45 CONFIG_NET_IPIP=m 46 + CONFIG_NET_IPGRE_DEMUX=m 28 47 CONFIG_NET_IPGRE=m 29 48 CONFIG_SYN_COOKIES=y 49 + CONFIG_NET_IPVTI=m 30 50 CONFIG_INET_AH=m 31 51 CONFIG_INET_ESP=m 32 52 CONFIG_INET_IPCOMP=m 33 53 CONFIG_INET_XFRM_MODE_TRANSPORT=m 34 54 CONFIG_INET_XFRM_MODE_TUNNEL=m 35 55 CONFIG_INET_XFRM_MODE_BEET=m 56 + # CONFIG_INET_LRO is not set 36 57 CONFIG_INET_DIAG=m 58 + CONFIG_INET_UDP_DIAG=m 37 59 CONFIG_IPV6_PRIVACY=y 38 60 CONFIG_IPV6_ROUTER_PREF=y 39 - CONFIG_IPV6_ROUTE_INFO=y 40 61 CONFIG_INET6_AH=m 41 62 CONFIG_INET6_ESP=m 42 63 CONFIG_INET6_IPCOMP=m 43 - CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 44 - CONFIG_IPV6_TUNNEL=m 64 + CONFIG_IPV6_GRE=m 45 65 CONFIG_NETFILTER=y 46 - CONFIG_NETFILTER_NETLINK_QUEUE=m 47 66 CONFIG_NF_CONNTRACK=m 67 + CONFIG_NF_CONNTRACK_ZONES=y 68 + # CONFIG_NF_CONNTRACK_PROCFS is not set 48 69 # CONFIG_NF_CT_PROTO_DCCP is not set 49 70 CONFIG_NF_CT_PROTO_UDPLITE=m 50 71 CONFIG_NF_CONNTRACK_AMANDA=m ··· 73 52 CONFIG_NF_CONNTRACK_H323=m 74 53 CONFIG_NF_CONNTRACK_IRC=m 75 54 CONFIG_NF_CONNTRACK_NETBIOS_NS=m 55 + CONFIG_NF_CONNTRACK_SNMP=m 76 56 CONFIG_NF_CONNTRACK_PPTP=m 77 57 CONFIG_NF_CONNTRACK_SANE=m 78 58 CONFIG_NF_CONNTRACK_SIP=m 79 59 CONFIG_NF_CONNTRACK_TFTP=m 60 + CONFIG_NETFILTER_XT_SET=m 61 + CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 80 62 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 81 63 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 82 64 CONFIG_NETFILTER_XT_TARGET_DSCP=m 65 + CONFIG_NETFILTER_XT_TARGET_HMARK=m 66 + CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m 67 + CONFIG_NETFILTER_XT_TARGET_LOG=m 83 68 CONFIG_NETFILTER_XT_TARGET_MARK=m 84 69 CONFIG_NETFILTER_XT_TARGET_NFLOG=m 85 70 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 71 + CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 72 + CONFIG_NETFILTER_XT_TARGET_TEE=m 86 73 CONFIG_NETFILTER_XT_TARGET_TRACE=m 87 74 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 88 75 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 76 + CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m 77 + CONFIG_NETFILTER_XT_MATCH_BPF=m 89 78 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m 90 79 CONFIG_NETFILTER_XT_MATCH_COMMENT=m 91 80 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 81 + CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m 92 82 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 93 83 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 94 84 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 85 + CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m 95 86 CONFIG_NETFILTER_XT_MATCH_DSCP=m 96 87 CONFIG_NETFILTER_XT_MATCH_ESP=m 97 88 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m ··· 114 81 CONFIG_NETFILTER_XT_MATCH_MAC=m 115 82 CONFIG_NETFILTER_XT_MATCH_MARK=m 116 83 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 84 + CONFIG_NETFILTER_XT_MATCH_NFACCT=m 85 + CONFIG_NETFILTER_XT_MATCH_OSF=m 117 86 CONFIG_NETFILTER_XT_MATCH_OWNER=m 118 87 CONFIG_NETFILTER_XT_MATCH_POLICY=m 119 88 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m ··· 129 94 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 130 95 CONFIG_NETFILTER_XT_MATCH_TIME=m 131 96 CONFIG_NETFILTER_XT_MATCH_U32=m 97 + CONFIG_IP_SET=m 98 + CONFIG_IP_SET_BITMAP_IP=m 99 + CONFIG_IP_SET_BITMAP_IPMAC=m 100 + CONFIG_IP_SET_BITMAP_PORT=m 101 + CONFIG_IP_SET_HASH_IP=m 102 + CONFIG_IP_SET_HASH_IPPORT=m 103 + CONFIG_IP_SET_HASH_IPPORTIP=m 104 + CONFIG_IP_SET_HASH_IPPORTNET=m 105 + CONFIG_IP_SET_HASH_NET=m 106 + CONFIG_IP_SET_HASH_NETPORT=m 107 + CONFIG_IP_SET_HASH_NETIFACE=m 108 + CONFIG_IP_SET_LIST_SET=m 132 109 CONFIG_NF_CONNTRACK_IPV4=m 133 - CONFIG_IP_NF_QUEUE=m 134 110 CONFIG_IP_NF_IPTABLES=m 135 - CONFIG_IP_NF_MATCH_ADDRTYPE=m 136 111 CONFIG_IP_NF_MATCH_AH=m 137 112 CONFIG_IP_NF_MATCH_ECN=m 113 + CONFIG_IP_NF_MATCH_RPFILTER=m 138 114 CONFIG_IP_NF_MATCH_TTL=m 139 115 CONFIG_IP_NF_FILTER=m 140 116 CONFIG_IP_NF_TARGET_REJECT=m 141 - CONFIG_IP_NF_TARGET_LOG=m 142 117 CONFIG_IP_NF_TARGET_ULOG=m 143 - CONFIG_NF_NAT=m 118 + CONFIG_NF_NAT_IPV4=m 144 119 CONFIG_IP_NF_TARGET_MASQUERADE=m 145 120 CONFIG_IP_NF_TARGET_NETMAP=m 146 121 CONFIG_IP_NF_TARGET_REDIRECT=m 147 - CONFIG_NF_NAT_SNMP_BASIC=m 148 122 CONFIG_IP_NF_MANGLE=m 149 123 CONFIG_IP_NF_TARGET_CLUSTERIP=m 150 124 CONFIG_IP_NF_TARGET_ECN=m ··· 163 119 CONFIG_IP_NF_ARPFILTER=m 164 120 CONFIG_IP_NF_ARP_MANGLE=m 165 121 CONFIG_NF_CONNTRACK_IPV6=m 166 - CONFIG_IP6_NF_QUEUE=m 167 122 CONFIG_IP6_NF_IPTABLES=m 168 123 CONFIG_IP6_NF_MATCH_AH=m 169 124 CONFIG_IP6_NF_MATCH_EUI64=m ··· 171 128 CONFIG_IP6_NF_MATCH_HL=m 172 129 CONFIG_IP6_NF_MATCH_IPV6HEADER=m 173 130 CONFIG_IP6_NF_MATCH_MH=m 131 + CONFIG_IP6_NF_MATCH_RPFILTER=m 174 132 CONFIG_IP6_NF_MATCH_RT=m 175 133 CONFIG_IP6_NF_TARGET_HL=m 176 - CONFIG_IP6_NF_TARGET_LOG=m 177 134 CONFIG_IP6_NF_FILTER=m 178 135 CONFIG_IP6_NF_TARGET_REJECT=m 179 136 CONFIG_IP6_NF_MANGLE=m 180 137 CONFIG_IP6_NF_RAW=m 138 + CONFIG_NF_NAT_IPV6=m 139 + CONFIG_IP6_NF_TARGET_MASQUERADE=m 140 + CONFIG_IP6_NF_TARGET_NPT=m 181 141 CONFIG_IP_DCCP=m 182 142 # CONFIG_IP_DCCP_CCID3 is not set 143 + CONFIG_SCTP_COOKIE_HMAC_SHA1=y 144 + CONFIG_RDS=m 145 + CONFIG_RDS_TCP=m 146 + CONFIG_L2TP=m 183 147 CONFIG_ATALK=m 148 + CONFIG_BATMAN_ADV=m 149 + CONFIG_BATMAN_ADV_DAT=y 150 + # CONFIG_WIRELESS is not set 184 151 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 152 + CONFIG_DEVTMPFS=y 185 153 # CONFIG_FIRMWARE_IN_KERNEL is not set 154 + # CONFIG_FW_LOADER_USER_HELPER is not set 186 155 CONFIG_CONNECTOR=m 187 156 CONFIG_BLK_DEV_LOOP=y 188 157 CONFIG_BLK_DEV_CRYPTOLOOP=m 158 + CONFIG_BLK_DEV_DRBD=m 189 159 CONFIG_BLK_DEV_NBD=m 190 160 CONFIG_BLK_DEV_RAM=y 191 161 CONFIG_CDROM_PKTCDVD=m ··· 213 157 CONFIG_BLK_DEV_SR_VENDOR=y 214 158 CONFIG_CHR_DEV_SG=m 215 159 CONFIG_SCSI_CONSTANTS=y 216 - CONFIG_SCSI_SAS_LIBSAS=m 217 - # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set 218 - CONFIG_SCSI_SRP_ATTRS=m 219 - CONFIG_SCSI_SRP_TGT_ATTRS=y 160 + CONFIG_SCSI_SAS_ATTRS=m 220 161 CONFIG_ISCSI_TCP=m 162 + CONFIG_ISCSI_BOOT_SYSFS=m 221 163 CONFIG_SUN3_SCSI=y 222 164 CONFIG_MD=y 223 - CONFIG_BLK_DEV_MD=m 224 165 CONFIG_MD_LINEAR=m 225 166 CONFIG_MD_RAID0=m 226 - CONFIG_MD_RAID1=m 227 - CONFIG_MD_RAID456=m 228 167 CONFIG_BLK_DEV_DM=m 229 168 CONFIG_DM_CRYPT=m 230 169 CONFIG_DM_SNAPSHOT=m 170 + CONFIG_DM_THIN_PROVISIONING=m 171 + CONFIG_DM_CACHE=m 231 172 CONFIG_DM_MIRROR=m 173 + CONFIG_DM_RAID=m 232 174 CONFIG_DM_ZERO=m 233 175 CONFIG_DM_MULTIPATH=m 234 176 CONFIG_DM_UEVENT=y 177 + CONFIG_TARGET_CORE=m 178 + CONFIG_TCM_IBLOCK=m 179 + CONFIG_TCM_FILEIO=m 180 + CONFIG_TCM_PSCSI=m 235 181 CONFIG_NETDEVICES=y 236 182 CONFIG_DUMMY=m 237 - CONFIG_MACVLAN=m 238 183 CONFIG_EQUALIZER=m 184 + CONFIG_NET_TEAM=m 185 + CONFIG_NET_TEAM_MODE_BROADCAST=m 186 + CONFIG_NET_TEAM_MODE_ROUNDROBIN=m 187 + CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 188 + CONFIG_NET_TEAM_MODE_LOADBALANCE=m 189 + CONFIG_VXLAN=m 190 + CONFIG_NETCONSOLE=m 191 + CONFIG_NETCONSOLE_DYNAMIC=y 239 192 CONFIG_VETH=m 240 - CONFIG_NET_ETHERNET=y 241 193 CONFIG_SUN3LANCE=y 194 + # CONFIG_NET_CADENCE is not set 242 195 CONFIG_SUN3_82586=y 243 - # CONFIG_NETDEV_1000 is not set 244 - # CONFIG_NETDEV_10000 is not set 196 + # CONFIG_NET_VENDOR_MARVELL is not set 197 + # CONFIG_NET_VENDOR_MICREL is not set 198 + # CONFIG_NET_VENDOR_NATSEMI is not set 199 + # CONFIG_NET_VENDOR_SEEQ is not set 200 + # CONFIG_NET_VENDOR_STMICRO is not set 201 + # CONFIG_NET_VENDOR_SUN is not set 202 + # CONFIG_NET_VENDOR_WIZNET is not set 245 203 CONFIG_PPP=m 246 - CONFIG_PPP_FILTER=y 247 - CONFIG_PPP_ASYNC=m 248 - CONFIG_PPP_SYNC_TTY=m 249 - CONFIG_PPP_DEFLATE=m 250 204 CONFIG_PPP_BSDCOMP=m 205 + CONFIG_PPP_DEFLATE=m 206 + CONFIG_PPP_FILTER=y 251 207 CONFIG_PPP_MPPE=m 252 208 CONFIG_PPPOE=m 209 + CONFIG_PPTP=m 210 + CONFIG_PPPOL2TP=m 211 + CONFIG_PPP_ASYNC=m 212 + CONFIG_PPP_SYNC_TTY=m 253 213 CONFIG_SLIP=m 254 214 CONFIG_SLIP_COMPRESSED=y 255 215 CONFIG_SLIP_SMART=y 256 216 CONFIG_SLIP_MODE_SLIP6=y 257 - CONFIG_NETCONSOLE=m 258 - CONFIG_NETCONSOLE_DYNAMIC=y 259 - CONFIG_INPUT_FF_MEMLESS=m 217 + # CONFIG_WLAN is not set 218 + CONFIG_INPUT_EVDEV=m 260 219 # CONFIG_KEYBOARD_ATKBD is not set 261 220 CONFIG_KEYBOARD_SUNKBD=y 262 - CONFIG_MOUSE_PS2=m 221 + # CONFIG_MOUSE_PS2 is not set 263 222 CONFIG_MOUSE_SERIAL=m 264 - # CONFIG_SERIO_SERPORT is not set 265 223 CONFIG_VT_HW_CONSOLE_BINDING=y 224 + # CONFIG_LEGACY_PTYS is not set 266 225 # CONFIG_DEVKMEM is not set 267 226 # CONFIG_HW_RANDOM is not set 268 - CONFIG_GEN_RTC=m 269 - CONFIG_GEN_RTC_X=y 227 + CONFIG_NTP_PPS=y 228 + CONFIG_PPS_CLIENT_LDISC=m 229 + CONFIG_PTP_1588_CLOCK=m 270 230 # CONFIG_HWMON is not set 271 231 CONFIG_FB=y 272 232 CONFIG_FRAMEBUFFER_CONSOLE=y 273 233 CONFIG_LOGO=y 274 234 CONFIG_HID=m 275 235 CONFIG_HIDRAW=y 236 + CONFIG_UHID=m 237 + # CONFIG_HID_GENERIC is not set 276 238 # CONFIG_USB_SUPPORT is not set 239 + CONFIG_RTC_CLASS=y 240 + CONFIG_RTC_DRV_GENERIC=m 241 + # CONFIG_IOMMU_SUPPORT is not set 242 + CONFIG_PROC_HARDWARE=y 277 243 CONFIG_EXT2_FS=y 278 244 CONFIG_EXT3_FS=y 279 245 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 280 246 # CONFIG_EXT3_FS_XATTR is not set 247 + CONFIG_EXT4_FS=y 281 248 CONFIG_REISERFS_FS=m 282 249 CONFIG_JFS_FS=m 283 250 CONFIG_XFS_FS=m 284 251 CONFIG_OCFS2_FS=m 285 - # CONFIG_OCFS2_FS_STATS is not set 286 252 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 253 + CONFIG_FANOTIFY=y 287 254 CONFIG_QUOTA_NETLINK_INTERFACE=y 288 255 # CONFIG_PRINT_QUOTA_WARNING is not set 289 - CONFIG_AUTOFS_FS=m 290 256 CONFIG_AUTOFS4_FS=m 291 257 CONFIG_FUSE_FS=m 258 + CONFIG_CUSE=m 292 259 CONFIG_ISO9660_FS=y 293 260 CONFIG_JOLIET=y 294 261 CONFIG_ZISOFS=y 295 262 CONFIG_UDF_FS=m 296 - CONFIG_MSDOS_FS=y 263 + CONFIG_MSDOS_FS=m 297 264 CONFIG_VFAT_FS=m 298 265 CONFIG_PROC_KCORE=y 299 266 CONFIG_TMPFS=y 300 267 CONFIG_AFFS_FS=m 268 + CONFIG_ECRYPT_FS=m 269 + CONFIG_ECRYPT_FS_MESSAGING=y 301 270 CONFIG_HFS_FS=m 302 271 CONFIG_HFSPLUS_FS=m 303 272 CONFIG_CRAMFS=m 304 273 CONFIG_SQUASHFS=m 305 - CONFIG_MINIX_FS=y 274 + CONFIG_SQUASHFS_LZO=y 275 + CONFIG_MINIX_FS=m 276 + CONFIG_OMFS_FS=m 306 277 CONFIG_HPFS_FS=m 278 + CONFIG_QNX4FS_FS=m 279 + CONFIG_QNX6FS_FS=m 307 280 CONFIG_SYSV_FS=m 308 281 CONFIG_UFS_FS=m 309 282 CONFIG_NFS_FS=y 310 - CONFIG_NFS_V3=y 311 283 CONFIG_NFS_V4=y 284 + CONFIG_NFS_SWAP=y 312 285 CONFIG_ROOT_NFS=y 313 286 CONFIG_NFSD=m 314 287 CONFIG_NFSD_V3=y 315 - CONFIG_SMB_FS=m 316 - CONFIG_SMB_NLS_DEFAULT=y 288 + CONFIG_CIFS=m 289 + # CONFIG_CIFS_DEBUG is not set 317 290 CONFIG_CODA_FS=m 318 291 CONFIG_NLS_CODEPAGE_437=y 319 292 CONFIG_NLS_CODEPAGE_737=m ··· 381 296 CONFIG_NLS_ISO8859_15=m 382 297 CONFIG_NLS_KOI8_R=m 383 298 CONFIG_NLS_KOI8_U=m 299 + CONFIG_NLS_MAC_ROMAN=m 300 + CONFIG_NLS_MAC_CELTIC=m 301 + CONFIG_NLS_MAC_CENTEURO=m 302 + CONFIG_NLS_MAC_CROATIAN=m 303 + CONFIG_NLS_MAC_CYRILLIC=m 304 + CONFIG_NLS_MAC_GAELIC=m 305 + CONFIG_NLS_MAC_GREEK=m 306 + CONFIG_NLS_MAC_ICELAND=m 307 + CONFIG_NLS_MAC_INUIT=m 308 + CONFIG_NLS_MAC_ROMANIAN=m 309 + CONFIG_NLS_MAC_TURKISH=m 384 310 CONFIG_DLM=m 385 311 CONFIG_MAGIC_SYSRQ=y 386 - # CONFIG_RCU_CPU_STALL_DETECTOR is not set 387 - CONFIG_SYSCTL_SYSCALL_CHECK=y 312 + CONFIG_ASYNC_RAID6_TEST=m 313 + CONFIG_ENCRYPTED_KEYS=m 314 + CONFIG_CRYPTO_MANAGER=y 315 + CONFIG_CRYPTO_USER=m 388 316 CONFIG_CRYPTO_NULL=m 389 317 CONFIG_CRYPTO_CRYPTD=m 390 318 CONFIG_CRYPTO_TEST=m ··· 407 309 CONFIG_CRYPTO_LRW=m 408 310 CONFIG_CRYPTO_PCBC=m 409 311 CONFIG_CRYPTO_XTS=m 410 - CONFIG_CRYPTO_HMAC=y 411 312 CONFIG_CRYPTO_XCBC=m 412 - CONFIG_CRYPTO_MD4=m 313 + CONFIG_CRYPTO_VMAC=m 413 314 CONFIG_CRYPTO_MICHAEL_MIC=m 414 315 CONFIG_CRYPTO_RMD128=m 415 316 CONFIG_CRYPTO_RMD160=m 416 317 CONFIG_CRYPTO_RMD256=m 417 318 CONFIG_CRYPTO_RMD320=m 418 - CONFIG_CRYPTO_SHA256=m 419 319 CONFIG_CRYPTO_SHA512=m 420 320 CONFIG_CRYPTO_TGR192=m 421 321 CONFIG_CRYPTO_WP512=m 422 - CONFIG_CRYPTO_AES=m 423 322 CONFIG_CRYPTO_ANUBIS=m 424 323 CONFIG_CRYPTO_BLOWFISH=m 425 324 CONFIG_CRYPTO_CAMELLIA=m ··· 432 337 CONFIG_CRYPTO_ZLIB=m 433 338 CONFIG_CRYPTO_LZO=m 434 339 # CONFIG_CRYPTO_ANSI_CPRNG is not set 340 + CONFIG_CRYPTO_USER_API_HASH=m 341 + CONFIG_CRYPTO_USER_API_SKCIPHER=m 435 342 # CONFIG_CRYPTO_HW is not set 436 - CONFIG_CRC16=m 437 343 CONFIG_CRC_T10DIF=y 344 + CONFIG_XZ_DEC_X86=y 345 + CONFIG_XZ_DEC_POWERPC=y 346 + CONFIG_XZ_DEC_IA64=y 347 + CONFIG_XZ_DEC_ARM=y 348 + CONFIG_XZ_DEC_ARMTHUMB=y 349 + CONFIG_XZ_DEC_SPARC=y 350 + CONFIG_XZ_DEC_TEST=m
+157 -53
arch/m68k/configs/sun3x_defconfig
··· 1 - CONFIG_EXPERIMENTAL=y 2 1 CONFIG_LOCALVERSION="-sun3x" 3 2 CONFIG_SYSVIPC=y 4 3 CONFIG_POSIX_MQUEUE=y 4 + CONFIG_FHANDLE=y 5 5 CONFIG_BSD_PROCESS_ACCT=y 6 - CONFIG_LOG_BUF_SHIFT=14 7 - CONFIG_RELAY=y 6 + CONFIG_BSD_PROCESS_ACCT_V3=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 12 CONFIG_BLK_DEV_INITRD=y 9 - # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 10 13 CONFIG_SLAB=y 11 14 CONFIG_MODULES=y 12 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 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 31 CONFIG_BINFMT_AOUT=m 15 32 CONFIG_BINFMT_MISC=m 16 - CONFIG_PROC_HARDWARE=y 17 33 CONFIG_NET=y 18 34 CONFIG_PACKET=y 35 + CONFIG_PACKET_DIAG=m 19 36 CONFIG_UNIX=y 37 + CONFIG_UNIX_DIAG=m 38 + CONFIG_XFRM_MIGRATE=y 20 39 CONFIG_NET_KEY=y 21 - CONFIG_NET_KEY_MIGRATE=y 22 40 CONFIG_INET=y 23 41 CONFIG_IP_PNP=y 24 42 CONFIG_IP_PNP_DHCP=y 25 43 CONFIG_IP_PNP_BOOTP=y 26 44 CONFIG_IP_PNP_RARP=y 27 45 CONFIG_NET_IPIP=m 46 + CONFIG_NET_IPGRE_DEMUX=m 28 47 CONFIG_NET_IPGRE=m 29 48 CONFIG_SYN_COOKIES=y 49 + CONFIG_NET_IPVTI=m 30 50 CONFIG_INET_AH=m 31 51 CONFIG_INET_ESP=m 32 52 CONFIG_INET_IPCOMP=m 33 53 CONFIG_INET_XFRM_MODE_TRANSPORT=m 34 54 CONFIG_INET_XFRM_MODE_TUNNEL=m 35 55 CONFIG_INET_XFRM_MODE_BEET=m 56 + # CONFIG_INET_LRO is not set 36 57 CONFIG_INET_DIAG=m 58 + CONFIG_INET_UDP_DIAG=m 37 59 CONFIG_IPV6_PRIVACY=y 38 60 CONFIG_IPV6_ROUTER_PREF=y 39 - CONFIG_IPV6_ROUTE_INFO=y 40 61 CONFIG_INET6_AH=m 41 62 CONFIG_INET6_ESP=m 42 63 CONFIG_INET6_IPCOMP=m 43 - CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 44 - CONFIG_IPV6_TUNNEL=m 64 + CONFIG_IPV6_GRE=m 45 65 CONFIG_NETFILTER=y 46 - CONFIG_NETFILTER_NETLINK_QUEUE=m 47 66 CONFIG_NF_CONNTRACK=m 67 + CONFIG_NF_CONNTRACK_ZONES=y 68 + # CONFIG_NF_CONNTRACK_PROCFS is not set 48 69 # CONFIG_NF_CT_PROTO_DCCP is not set 49 70 CONFIG_NF_CT_PROTO_UDPLITE=m 50 71 CONFIG_NF_CONNTRACK_AMANDA=m ··· 73 52 CONFIG_NF_CONNTRACK_H323=m 74 53 CONFIG_NF_CONNTRACK_IRC=m 75 54 CONFIG_NF_CONNTRACK_NETBIOS_NS=m 55 + CONFIG_NF_CONNTRACK_SNMP=m 76 56 CONFIG_NF_CONNTRACK_PPTP=m 77 57 CONFIG_NF_CONNTRACK_SANE=m 78 58 CONFIG_NF_CONNTRACK_SIP=m 79 59 CONFIG_NF_CONNTRACK_TFTP=m 60 + CONFIG_NETFILTER_XT_SET=m 61 + CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 80 62 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 81 63 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 82 64 CONFIG_NETFILTER_XT_TARGET_DSCP=m 65 + CONFIG_NETFILTER_XT_TARGET_HMARK=m 66 + CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m 67 + CONFIG_NETFILTER_XT_TARGET_LOG=m 83 68 CONFIG_NETFILTER_XT_TARGET_MARK=m 84 69 CONFIG_NETFILTER_XT_TARGET_NFLOG=m 85 70 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 71 + CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 72 + CONFIG_NETFILTER_XT_TARGET_TEE=m 86 73 CONFIG_NETFILTER_XT_TARGET_TRACE=m 87 74 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 88 75 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 76 + CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m 77 + CONFIG_NETFILTER_XT_MATCH_BPF=m 89 78 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m 90 79 CONFIG_NETFILTER_XT_MATCH_COMMENT=m 91 80 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 81 + CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m 92 82 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m 93 83 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 94 84 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 85 + CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m 95 86 CONFIG_NETFILTER_XT_MATCH_DSCP=m 96 87 CONFIG_NETFILTER_XT_MATCH_ESP=m 97 88 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m ··· 114 81 CONFIG_NETFILTER_XT_MATCH_MAC=m 115 82 CONFIG_NETFILTER_XT_MATCH_MARK=m 116 83 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m 84 + CONFIG_NETFILTER_XT_MATCH_NFACCT=m 85 + CONFIG_NETFILTER_XT_MATCH_OSF=m 117 86 CONFIG_NETFILTER_XT_MATCH_OWNER=m 118 87 CONFIG_NETFILTER_XT_MATCH_POLICY=m 119 88 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m ··· 129 94 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 130 95 CONFIG_NETFILTER_XT_MATCH_TIME=m 131 96 CONFIG_NETFILTER_XT_MATCH_U32=m 97 + CONFIG_IP_SET=m 98 + CONFIG_IP_SET_BITMAP_IP=m 99 + CONFIG_IP_SET_BITMAP_IPMAC=m 100 + CONFIG_IP_SET_BITMAP_PORT=m 101 + CONFIG_IP_SET_HASH_IP=m 102 + CONFIG_IP_SET_HASH_IPPORT=m 103 + CONFIG_IP_SET_HASH_IPPORTIP=m 104 + CONFIG_IP_SET_HASH_IPPORTNET=m 105 + CONFIG_IP_SET_HASH_NET=m 106 + CONFIG_IP_SET_HASH_NETPORT=m 107 + CONFIG_IP_SET_HASH_NETIFACE=m 108 + CONFIG_IP_SET_LIST_SET=m 132 109 CONFIG_NF_CONNTRACK_IPV4=m 133 - CONFIG_IP_NF_QUEUE=m 134 110 CONFIG_IP_NF_IPTABLES=m 135 - CONFIG_IP_NF_MATCH_ADDRTYPE=m 136 111 CONFIG_IP_NF_MATCH_AH=m 137 112 CONFIG_IP_NF_MATCH_ECN=m 113 + CONFIG_IP_NF_MATCH_RPFILTER=m 138 114 CONFIG_IP_NF_MATCH_TTL=m 139 115 CONFIG_IP_NF_FILTER=m 140 116 CONFIG_IP_NF_TARGET_REJECT=m 141 - CONFIG_IP_NF_TARGET_LOG=m 142 117 CONFIG_IP_NF_TARGET_ULOG=m 143 - CONFIG_NF_NAT=m 118 + CONFIG_NF_NAT_IPV4=m 144 119 CONFIG_IP_NF_TARGET_MASQUERADE=m 145 120 CONFIG_IP_NF_TARGET_NETMAP=m 146 121 CONFIG_IP_NF_TARGET_REDIRECT=m 147 - CONFIG_NF_NAT_SNMP_BASIC=m 148 122 CONFIG_IP_NF_MANGLE=m 149 123 CONFIG_IP_NF_TARGET_CLUSTERIP=m 150 124 CONFIG_IP_NF_TARGET_ECN=m ··· 163 119 CONFIG_IP_NF_ARPFILTER=m 164 120 CONFIG_IP_NF_ARP_MANGLE=m 165 121 CONFIG_NF_CONNTRACK_IPV6=m 166 - CONFIG_IP6_NF_QUEUE=m 167 122 CONFIG_IP6_NF_IPTABLES=m 168 123 CONFIG_IP6_NF_MATCH_AH=m 169 124 CONFIG_IP6_NF_MATCH_EUI64=m ··· 171 128 CONFIG_IP6_NF_MATCH_HL=m 172 129 CONFIG_IP6_NF_MATCH_IPV6HEADER=m 173 130 CONFIG_IP6_NF_MATCH_MH=m 131 + CONFIG_IP6_NF_MATCH_RPFILTER=m 174 132 CONFIG_IP6_NF_MATCH_RT=m 175 133 CONFIG_IP6_NF_TARGET_HL=m 176 - CONFIG_IP6_NF_TARGET_LOG=m 177 134 CONFIG_IP6_NF_FILTER=m 178 135 CONFIG_IP6_NF_TARGET_REJECT=m 179 136 CONFIG_IP6_NF_MANGLE=m 180 137 CONFIG_IP6_NF_RAW=m 138 + CONFIG_NF_NAT_IPV6=m 139 + CONFIG_IP6_NF_TARGET_MASQUERADE=m 140 + CONFIG_IP6_NF_TARGET_NPT=m 181 141 CONFIG_IP_DCCP=m 182 142 # CONFIG_IP_DCCP_CCID3 is not set 143 + CONFIG_SCTP_COOKIE_HMAC_SHA1=y 144 + CONFIG_RDS=m 145 + CONFIG_RDS_TCP=m 146 + CONFIG_L2TP=m 183 147 CONFIG_ATALK=m 148 + CONFIG_BATMAN_ADV=m 149 + CONFIG_BATMAN_ADV_DAT=y 150 + # CONFIG_WIRELESS is not set 184 151 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 152 + CONFIG_DEVTMPFS=y 185 153 # CONFIG_FIRMWARE_IN_KERNEL is not set 154 + # CONFIG_FW_LOADER_USER_HELPER is not set 186 155 CONFIG_CONNECTOR=m 187 156 CONFIG_BLK_DEV_LOOP=y 188 157 CONFIG_BLK_DEV_CRYPTOLOOP=m 158 + CONFIG_BLK_DEV_DRBD=m 189 159 CONFIG_BLK_DEV_NBD=m 190 160 CONFIG_BLK_DEV_RAM=y 191 161 CONFIG_CDROM_PKTCDVD=m ··· 213 157 CONFIG_BLK_DEV_SR_VENDOR=y 214 158 CONFIG_CHR_DEV_SG=m 215 159 CONFIG_SCSI_CONSTANTS=y 216 - CONFIG_SCSI_SAS_LIBSAS=m 217 - # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set 218 - CONFIG_SCSI_SRP_ATTRS=m 219 - CONFIG_SCSI_SRP_TGT_ATTRS=y 160 + CONFIG_SCSI_SAS_ATTRS=m 220 161 CONFIG_ISCSI_TCP=m 162 + CONFIG_ISCSI_BOOT_SYSFS=m 221 163 CONFIG_SUN3X_ESP=y 222 164 CONFIG_MD=y 223 - CONFIG_BLK_DEV_MD=m 224 165 CONFIG_MD_LINEAR=m 225 166 CONFIG_MD_RAID0=m 226 - CONFIG_MD_RAID1=m 227 - CONFIG_MD_RAID456=m 228 167 CONFIG_BLK_DEV_DM=m 229 168 CONFIG_DM_CRYPT=m 230 169 CONFIG_DM_SNAPSHOT=m 170 + CONFIG_DM_THIN_PROVISIONING=m 171 + CONFIG_DM_CACHE=m 231 172 CONFIG_DM_MIRROR=m 173 + CONFIG_DM_RAID=m 232 174 CONFIG_DM_ZERO=m 233 175 CONFIG_DM_MULTIPATH=m 234 176 CONFIG_DM_UEVENT=y 177 + CONFIG_TARGET_CORE=m 178 + CONFIG_TCM_IBLOCK=m 179 + CONFIG_TCM_FILEIO=m 180 + CONFIG_TCM_PSCSI=m 235 181 CONFIG_NETDEVICES=y 236 182 CONFIG_DUMMY=m 237 - CONFIG_MACVLAN=m 238 183 CONFIG_EQUALIZER=m 184 + CONFIG_NET_TEAM=m 185 + CONFIG_NET_TEAM_MODE_BROADCAST=m 186 + CONFIG_NET_TEAM_MODE_ROUNDROBIN=m 187 + CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 188 + CONFIG_NET_TEAM_MODE_LOADBALANCE=m 189 + CONFIG_VXLAN=m 190 + CONFIG_NETCONSOLE=m 191 + CONFIG_NETCONSOLE_DYNAMIC=y 239 192 CONFIG_VETH=m 240 - CONFIG_NET_ETHERNET=y 241 193 CONFIG_SUN3LANCE=y 242 - # CONFIG_NETDEV_1000 is not set 243 - # CONFIG_NETDEV_10000 is not set 194 + # CONFIG_NET_CADENCE is not set 195 + # CONFIG_NET_VENDOR_BROADCOM is not set 196 + # CONFIG_NET_VENDOR_INTEL is not set 197 + # CONFIG_NET_VENDOR_MARVELL is not set 198 + # CONFIG_NET_VENDOR_MICREL is not set 199 + # CONFIG_NET_VENDOR_NATSEMI is not set 200 + # CONFIG_NET_VENDOR_SEEQ is not set 201 + # CONFIG_NET_VENDOR_STMICRO is not set 202 + # CONFIG_NET_VENDOR_WIZNET is not set 244 203 CONFIG_PPP=m 245 - CONFIG_PPP_FILTER=y 246 - CONFIG_PPP_ASYNC=m 247 - CONFIG_PPP_SYNC_TTY=m 248 - CONFIG_PPP_DEFLATE=m 249 204 CONFIG_PPP_BSDCOMP=m 205 + CONFIG_PPP_DEFLATE=m 206 + CONFIG_PPP_FILTER=y 250 207 CONFIG_PPP_MPPE=m 251 208 CONFIG_PPPOE=m 209 + CONFIG_PPTP=m 210 + CONFIG_PPPOL2TP=m 211 + CONFIG_PPP_ASYNC=m 212 + CONFIG_PPP_SYNC_TTY=m 252 213 CONFIG_SLIP=m 253 214 CONFIG_SLIP_COMPRESSED=y 254 215 CONFIG_SLIP_SMART=y 255 216 CONFIG_SLIP_MODE_SLIP6=y 256 - CONFIG_NETCONSOLE=m 257 - CONFIG_NETCONSOLE_DYNAMIC=y 258 - CONFIG_INPUT_FF_MEMLESS=m 217 + # CONFIG_WLAN is not set 218 + CONFIG_INPUT_EVDEV=m 259 219 # CONFIG_KEYBOARD_ATKBD is not set 260 220 CONFIG_KEYBOARD_SUNKBD=y 261 - CONFIG_MOUSE_PS2=m 221 + # CONFIG_MOUSE_PS2 is not set 262 222 CONFIG_MOUSE_SERIAL=m 263 - # CONFIG_SERIO_SERPORT is not set 264 223 CONFIG_VT_HW_CONSOLE_BINDING=y 224 + # CONFIG_LEGACY_PTYS is not set 265 225 # CONFIG_DEVKMEM is not set 266 226 # CONFIG_HW_RANDOM is not set 267 - CONFIG_GEN_RTC=m 268 - CONFIG_GEN_RTC_X=y 227 + CONFIG_NTP_PPS=y 228 + CONFIG_PPS_CLIENT_LDISC=m 229 + CONFIG_PTP_1588_CLOCK=m 269 230 # CONFIG_HWMON is not set 270 231 CONFIG_FB=y 271 232 CONFIG_FRAMEBUFFER_CONSOLE=y 272 233 CONFIG_LOGO=y 273 234 CONFIG_HID=m 274 235 CONFIG_HIDRAW=y 236 + CONFIG_UHID=m 237 + # CONFIG_HID_GENERIC is not set 275 238 # CONFIG_USB_SUPPORT is not set 239 + CONFIG_RTC_CLASS=y 240 + CONFIG_RTC_DRV_GENERIC=m 241 + # CONFIG_IOMMU_SUPPORT is not set 242 + CONFIG_PROC_HARDWARE=y 276 243 CONFIG_EXT2_FS=y 277 244 CONFIG_EXT3_FS=y 278 245 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 279 246 # CONFIG_EXT3_FS_XATTR is not set 247 + CONFIG_EXT4_FS=y 280 248 CONFIG_REISERFS_FS=m 281 249 CONFIG_JFS_FS=m 282 250 CONFIG_XFS_FS=m 283 251 CONFIG_OCFS2_FS=m 284 - # CONFIG_OCFS2_FS_STATS is not set 285 252 # CONFIG_OCFS2_DEBUG_MASKLOG is not set 253 + CONFIG_FANOTIFY=y 286 254 CONFIG_QUOTA_NETLINK_INTERFACE=y 287 255 # CONFIG_PRINT_QUOTA_WARNING is not set 288 - CONFIG_AUTOFS_FS=m 289 256 CONFIG_AUTOFS4_FS=m 290 257 CONFIG_FUSE_FS=m 258 + CONFIG_CUSE=m 291 259 CONFIG_ISO9660_FS=y 292 260 CONFIG_JOLIET=y 293 261 CONFIG_ZISOFS=y 294 262 CONFIG_UDF_FS=m 295 - CONFIG_MSDOS_FS=y 263 + CONFIG_MSDOS_FS=m 296 264 CONFIG_VFAT_FS=m 297 265 CONFIG_PROC_KCORE=y 298 266 CONFIG_TMPFS=y 299 267 CONFIG_AFFS_FS=m 268 + CONFIG_ECRYPT_FS=m 269 + CONFIG_ECRYPT_FS_MESSAGING=y 300 270 CONFIG_HFS_FS=m 301 271 CONFIG_HFSPLUS_FS=m 302 272 CONFIG_CRAMFS=m 303 273 CONFIG_SQUASHFS=m 304 - CONFIG_MINIX_FS=y 274 + CONFIG_SQUASHFS_LZO=y 275 + CONFIG_MINIX_FS=m 276 + CONFIG_OMFS_FS=m 305 277 CONFIG_HPFS_FS=m 278 + CONFIG_QNX4FS_FS=m 279 + CONFIG_QNX6FS_FS=m 306 280 CONFIG_SYSV_FS=m 307 281 CONFIG_UFS_FS=m 308 282 CONFIG_NFS_FS=y 309 - CONFIG_NFS_V3=y 310 283 CONFIG_NFS_V4=y 284 + CONFIG_NFS_SWAP=y 311 285 CONFIG_ROOT_NFS=y 312 286 CONFIG_NFSD=m 313 287 CONFIG_NFSD_V3=y 314 - CONFIG_SMB_FS=m 315 - CONFIG_SMB_NLS_DEFAULT=y 288 + CONFIG_CIFS=m 289 + # CONFIG_CIFS_DEBUG is not set 316 290 CONFIG_CODA_FS=m 317 291 CONFIG_NLS_CODEPAGE_437=y 318 292 CONFIG_NLS_CODEPAGE_737=m ··· 381 295 CONFIG_NLS_ISO8859_15=m 382 296 CONFIG_NLS_KOI8_R=m 383 297 CONFIG_NLS_KOI8_U=m 298 + CONFIG_NLS_MAC_ROMAN=m 299 + CONFIG_NLS_MAC_CELTIC=m 300 + CONFIG_NLS_MAC_CENTEURO=m 301 + CONFIG_NLS_MAC_CROATIAN=m 302 + CONFIG_NLS_MAC_CYRILLIC=m 303 + CONFIG_NLS_MAC_GAELIC=m 304 + CONFIG_NLS_MAC_GREEK=m 305 + CONFIG_NLS_MAC_ICELAND=m 306 + CONFIG_NLS_MAC_INUIT=m 307 + CONFIG_NLS_MAC_ROMANIAN=m 308 + CONFIG_NLS_MAC_TURKISH=m 384 309 CONFIG_DLM=m 385 310 CONFIG_MAGIC_SYSRQ=y 386 - # CONFIG_RCU_CPU_STALL_DETECTOR is not set 387 - CONFIG_SYSCTL_SYSCALL_CHECK=y 311 + CONFIG_ASYNC_RAID6_TEST=m 312 + CONFIG_ENCRYPTED_KEYS=m 313 + CONFIG_CRYPTO_MANAGER=y 314 + CONFIG_CRYPTO_USER=m 388 315 CONFIG_CRYPTO_NULL=m 389 316 CONFIG_CRYPTO_CRYPTD=m 390 317 CONFIG_CRYPTO_TEST=m ··· 407 308 CONFIG_CRYPTO_LRW=m 408 309 CONFIG_CRYPTO_PCBC=m 409 310 CONFIG_CRYPTO_XTS=m 410 - CONFIG_CRYPTO_HMAC=y 411 311 CONFIG_CRYPTO_XCBC=m 412 - CONFIG_CRYPTO_MD4=m 312 + CONFIG_CRYPTO_VMAC=m 413 313 CONFIG_CRYPTO_MICHAEL_MIC=m 414 314 CONFIG_CRYPTO_RMD128=m 415 315 CONFIG_CRYPTO_RMD160=m 416 316 CONFIG_CRYPTO_RMD256=m 417 317 CONFIG_CRYPTO_RMD320=m 418 - CONFIG_CRYPTO_SHA256=m 419 318 CONFIG_CRYPTO_SHA512=m 420 319 CONFIG_CRYPTO_TGR192=m 421 320 CONFIG_CRYPTO_WP512=m 422 - CONFIG_CRYPTO_AES=m 423 321 CONFIG_CRYPTO_ANUBIS=m 424 322 CONFIG_CRYPTO_BLOWFISH=m 425 323 CONFIG_CRYPTO_CAMELLIA=m ··· 432 336 CONFIG_CRYPTO_ZLIB=m 433 337 CONFIG_CRYPTO_LZO=m 434 338 # CONFIG_CRYPTO_ANSI_CPRNG is not set 339 + CONFIG_CRYPTO_USER_API_HASH=m 340 + CONFIG_CRYPTO_USER_API_SKCIPHER=m 435 341 # CONFIG_CRYPTO_HW is not set 436 - CONFIG_CRC16=m 437 342 CONFIG_CRC_T10DIF=y 343 + CONFIG_XZ_DEC_X86=y 344 + CONFIG_XZ_DEC_POWERPC=y 345 + CONFIG_XZ_DEC_IA64=y 346 + CONFIG_XZ_DEC_ARM=y 347 + CONFIG_XZ_DEC_ARMTHUMB=y 348 + CONFIG_XZ_DEC_SPARC=y 349 + CONFIG_XZ_DEC_TEST=m
-1
arch/m68k/include/asm/Kbuild
··· 6 6 generic-y += emergency-restart.h 7 7 generic-y += errno.h 8 8 generic-y += exec.h 9 - generic-y += futex.h 10 9 generic-y += hw_irq.h 11 10 generic-y += ioctl.h 12 11 generic-y += ipcbuf.h
+94
arch/m68k/include/asm/futex.h
··· 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 */
+1 -1
arch/microblaze/include/asm/futex.h
··· 105 105 106 106 __asm__ __volatile__ ("1: lwx %1, %3, r0; \ 107 107 cmp %2, %1, %4; \ 108 - beqi %2, 3f; \ 108 + bnei %2, 3f; \ 109 109 2: swx %5, %3, r0; \ 110 110 addic %2, r0, 0; \ 111 111 bnei %2, 1b; \
+3 -3
arch/microblaze/include/asm/io.h
··· 123 123 * inb_p/inw_p/... 124 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 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 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 131 #define outl(val, port) writel((val), (u32 *)((unsigned long)(port))) 132 132 133 133 #define inb_p(port) inb((port))
+1 -1
arch/microblaze/kernel/cpu/cache.c
··· 140 140 /* It is used only first parameter for OP - for wic, wdc */ 141 141 #define CACHE_RANGE_LOOP_1(start, end, line_length, op) \ 142 142 do { \ 143 - int volatile temp; \ 143 + int volatile temp = 0; \ 144 144 int align = ~(line_length - 1); \ 145 145 end = ((end & align) == end) ? end - line_length : end & align; \ 146 146 WARN_ON(end - start < 0); \
+2
arch/mn10300/include/asm/pci.h
··· 103 103 return channel ? 15 : 14; 104 104 } 105 105 106 + #include <asm-generic/pci_iomap.h> 107 + 106 108 #endif /* _ASM_PCI_H */
+6 -13
arch/mn10300/kernel/entry.S
··· 60 60 mov (REG_D0,fp),d0 61 61 mov (REG_A0,fp),a0 62 62 calls (a0) 63 + GET_THREAD_INFO a2 # A2 must be set on return from sys_exit() 63 64 clr d0 64 65 mov d0,(REG_D0,fp) 65 66 jmp syscall_exit ··· 108 107 and EPSW_nSL,d0 109 108 beq resume_kernel # returning to supervisor mode 110 109 111 - btst _TIF_SYSCALL_TRACE,d2 112 - beq work_pending 113 110 LOCAL_IRQ_ENABLE # could let syscall_trace_exit() call 114 111 # schedule() instead 112 + btst _TIF_SYSCALL_TRACE,d2 113 + beq work_pending 115 114 mov fp,d0 116 115 call syscall_trace_exit[],0 # do_syscall_trace(regs) 117 116 jmp resume_userspace ··· 124 123 work_resched: 125 124 call schedule[],0 126 125 126 + resume_userspace: 127 127 # make sure we don't miss an interrupt setting need_resched or 128 128 # sigpending between sampling and the rti 129 129 LOCAL_IRQ_DISABLE ··· 133 131 mov (TI_flags,a2),d2 134 132 btst _TIF_WORK_MASK,d2 135 133 beq restore_all 134 + 135 + LOCAL_IRQ_ENABLE 136 136 btst _TIF_NEED_RESCHED,d2 137 137 bne work_resched 138 138 ··· 172 168 # returning to userspace 173 169 and EPSW_nSL,d0 174 170 beq resume_kernel # returning to supervisor mode 175 - 176 - ENTRY(resume_userspace) 177 - # make sure we don't miss an interrupt setting need_resched or 178 - # sigpending between sampling and the rti 179 - LOCAL_IRQ_DISABLE 180 - 181 - # is there any work to be done on int/exception return? 182 - mov (TI_flags,a2),d2 183 - btst _TIF_WORK_MASK,d2 184 - bne work_pending 185 - jmp restore_all 186 171 187 172 #ifdef CONFIG_PREEMPT 188 173 ENTRY(resume_kernel)
+1
arch/mn10300/unit-asb2305/pci.c
··· 19 19 #include <linux/delay.h> 20 20 #include <linux/irq.h> 21 21 #include <asm/io.h> 22 + #include <asm/irq.h> 22 23 #include "pci-asb2305.h" 23 24 24 25 unsigned int pci_probe = 1;
+1 -1
arch/parisc/Makefile
··· 66 66 endif 67 67 68 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 70 cflags-$(CONFIG_PA7200) += -march=1.1 -mschedule=7200 71 71 cflags-$(CONFIG_PA7100LC) += -march=1.1 -mschedule=7100LC 72 72 cflags-$(CONFIG_PA7300LC) += -march=1.1 -mschedule=7300
+1 -4
arch/parisc/include/asm/mmzone.h
··· 39 39 static inline int pfn_to_nid(unsigned long pfn) 40 40 { 41 41 unsigned int i; 42 - unsigned char r; 43 42 44 43 if (unlikely(pfn_is_io(pfn))) 45 44 return 0; 46 45 47 46 i = pfn >> PFNNID_SHIFT; 48 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 52 static inline int pfn_valid(int pfn)
+1 -1
arch/parisc/kernel/drivers.c
··· 394 394 static void setup_bus_id(struct parisc_device *padev) 395 395 { 396 396 struct hardware_path path; 397 - char name[20]; 397 + char name[28]; 398 398 char *output = name; 399 399 int i; 400 400
+2 -1
arch/parisc/kernel/setup.c
··· 69 69 /* called from hpux boot loader */ 70 70 boot_command_line[0] = '\0'; 71 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 75 #ifdef CONFIG_BLK_DEV_INITRD 75 76 if (boot_args[2] != 0) /* did palo pass us a ramdisk? */
+1
arch/powerpc/include/asm/hvcall.h
··· 264 264 #define H_GET_MPP 0x2D4 265 265 #define H_HOME_NODE_ASSOCIATIVITY 0x2EC 266 266 #define H_BEST_ENERGY 0x2F4 267 + #define H_XIRR_X 0x2FC 267 268 #define H_RANDOM 0x300 268 269 #define H_COP 0x304 269 270 #define H_GET_MPP_X 0x314
+11
arch/powerpc/include/asm/ppc_asm.h
··· 523 523 #define PPC440EP_ERR42 524 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 538 * toreal/fromreal/tophys/tovirt macros. 32-bit BookE makes them 528 539 * keep the address intact to be compatible with code shared with
+4 -9
arch/powerpc/include/asm/processor.h
··· 409 409 #endif 410 410 411 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 414 if (is_32) 417 - sp = regs->gpr[1] & 0x0ffffffffUL; 418 - else 419 - sp = regs->gpr[1]; 420 - 415 + return sp & 0x0ffffffffUL; 421 416 return sp; 422 417 } 423 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 423 #endif 429 424
-11
arch/powerpc/include/asm/reg.h
··· 111 111 #define MSR_TM_TRANSACTIONAL(x) (((x) & MSR_TS_MASK) == MSR_TS_T) 112 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 114 #if defined(CONFIG_PPC_BOOK3S_64) 126 115 #define MSR_64BIT MSR_SF 127 116
+3
arch/powerpc/include/asm/signal.h
··· 3 3 4 4 #define __ARCH_HAS_SA_RESTORER 5 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 10 #endif /* _ASM_POWERPC_SIGNAL_H */
+2
arch/powerpc/include/asm/tm.h
··· 5 5 * Copyright 2012 Matt Evans & Michael Neuling, IBM Corporation. 6 6 */ 7 7 8 + #include <uapi/asm/tm.h> 9 + 8 10 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM 9 11 extern void do_load_up_transact_fpu(struct thread_struct *thread); 10 12 extern void do_load_up_transact_altivec(struct thread_struct *thread);
+1
arch/powerpc/include/uapi/asm/Kbuild
··· 40 40 header-y += swab.h 41 41 header-y += termbits.h 42 42 header-y += termios.h 43 + header-y += tm.h 43 44 header-y += types.h 44 45 header-y += ucontext.h 45 46 header-y += unistd.h
+18
arch/powerpc/include/uapi/asm/tm.h
··· 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
+3 -3
arch/powerpc/kernel/cputable.c
··· 453 453 .icache_bsize = 128, 454 454 .dcache_bsize = 128, 455 455 .oprofile_type = PPC_OPROFILE_POWER4, 456 - .oprofile_cpu_type = "ppc64/ibm-compat-v1", 456 + .oprofile_cpu_type = 0, 457 457 .cpu_setup = __setup_cpu_power8, 458 458 .cpu_restore = __restore_cpu_power8, 459 459 .platform = "power8", ··· 482 482 .cpu_name = "POWER7+ (raw)", 483 483 .cpu_features = CPU_FTRS_POWER7, 484 484 .cpu_user_features = COMMON_USER_POWER7, 485 - .cpu_user_features = COMMON_USER2_POWER7, 485 + .cpu_user_features2 = COMMON_USER2_POWER7, 486 486 .mmu_features = MMU_FTRS_POWER7, 487 487 .icache_bsize = 128, 488 488 .dcache_bsize = 128, ··· 506 506 .dcache_bsize = 128, 507 507 .num_pmcs = 6, 508 508 .pmc_type = PPC_PMC_IBM, 509 - .oprofile_cpu_type = "ppc64/power8", 509 + .oprofile_cpu_type = 0, 510 510 .oprofile_type = PPC_OPROFILE_POWER4, 511 511 .cpu_setup = __setup_cpu_power8, 512 512 .cpu_restore = __restore_cpu_power8,
+1 -1
arch/powerpc/kernel/entry_32.S
··· 849 849 /* check current_thread_info, _TIF_EMULATE_STACK_STORE */ 850 850 CURRENT_THREAD_INFO(r9, r1) 851 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 853 beq+ 1f 854 854 855 855 addi r8,r1,INT_FRAME_SIZE /* Get the kprobed function entry */
+7
arch/powerpc/kernel/entry_64.S
··· 501 501 ldarx r6,0,r1 502 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 511 addi r6,r4,-THREAD /* Convert THREAD to 'current' */ 505 512 std r6,PACACURRENT(r13) /* Set new 'current' */ 506 513
+1 -13
arch/powerpc/kernel/pci-common.c
··· 657 657 * ranges. However, some machines (thanks Apple !) tend to split their 658 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 660 * - Some busses have IO space not starting at 0, which causes trouble with 670 661 * the way we do our IO resource renumbering. The code somewhat deals with 671 662 * it for 64 bits but I would expect problems on 32 bits. ··· 671 680 int rlen; 672 681 int pna = of_n_addr_cells(dev); 673 682 int np = pna + 5; 674 - int memno = 0, isa_hole = -1; 683 + int memno = 0; 675 684 u32 pci_space; 676 685 unsigned long long pci_addr, cpu_addr, pci_next, cpu_next, size; 677 - unsigned long long isa_mb = 0; 678 686 struct resource *res; 679 687 680 688 printk(KERN_INFO "PCI host bridge %s %s ranges:\n", ··· 767 777 } 768 778 /* Handles ISA memory hole space here */ 769 779 if (pci_addr == 0) { 770 - isa_mb = cpu_addr; 771 - isa_hole = memno; 772 780 if (primary || isa_mem_base == 0) 773 781 isa_mem_base = cpu_addr; 774 782 hose->isa_mem_phys = cpu_addr;
+38 -2
arch/powerpc/kernel/signal.c
··· 18 18 #include <asm/uaccess.h> 19 19 #include <asm/unistd.h> 20 20 #include <asm/debug.h> 21 + #include <asm/tm.h> 21 22 22 23 #include "signal.h" 23 24 ··· 31 30 /* 32 31 * Allocate space for the signal frame 33 32 */ 34 - void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, 33 + void __user * get_sigframe(struct k_sigaction *ka, unsigned long sp, 35 34 size_t frame_size, int is_32) 36 35 { 37 36 unsigned long oldsp, newsp; 38 37 39 38 /* Default to using normal stack */ 40 - oldsp = get_clean_sp(regs, is_32); 39 + oldsp = get_clean_sp(sp, is_32); 41 40 42 41 /* Check for alt stack */ 43 42 if ((ka->sa.sa_flags & SA_ONSTACK) && ··· 175 174 } 176 175 177 176 user_enter(); 177 + } 178 + 179 + unsigned long get_tm_stackpointer(struct pt_regs *regs) 180 + { 181 + /* When in an active transaction that takes a signal, we need to be 182 + * careful with the stack. It's possible that the stack has moved back 183 + * up after the tbegin. The obvious case here is when the tbegin is 184 + * called inside a function that returns before a tend. In this case, 185 + * the stack is part of the checkpointed transactional memory state. 186 + * If we write over this non transactionally or in suspend, we are in 187 + * trouble because if we get a tm abort, the program counter and stack 188 + * pointer will be back at the tbegin but our in memory stack won't be 189 + * valid anymore. 190 + * 191 + * To avoid this, when taking a signal in an active transaction, we 192 + * need to use the stack pointer from the checkpointed state, rather 193 + * than the speculated state. This ensures that the signal context 194 + * (written tm suspended) will be written below the stack required for 195 + * the rollback. The transaction is aborted becuase of the treclaim, 196 + * so any memory written between the tbegin and the signal will be 197 + * rolled back anyway. 198 + * 199 + * For signals taken in non-TM or suspended mode, we use the 200 + * normal/non-checkpointed stack pointer. 201 + */ 202 + 203 + #ifdef CONFIG_PPC_TRANSACTIONAL_MEM 204 + if (MSR_TM_ACTIVE(regs->msr)) { 205 + tm_enable(); 206 + tm_reclaim(&current->thread, regs->msr, TM_CAUSE_SIGNAL); 207 + if (MSR_TM_TRANSACTIONAL(regs->msr)) 208 + return current->thread.ckpt_regs.gpr[1]; 209 + } 210 + #endif 211 + return regs->gpr[1]; 178 212 }
+1 -1
arch/powerpc/kernel/signal.h
··· 12 12 13 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 16 size_t frame_size, int is_32); 17 17 18 18 extern int handle_signal32(unsigned long sig, struct k_sigaction *ka,
+2 -8
arch/powerpc/kernel/signal_32.c
··· 503 503 { 504 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(&current->thread, msr, TM_CAUSE_SIGNAL); 511 - 512 506 /* Make sure floating point registers are stored in regs */ 513 507 flush_fp_to_thread(current); 514 508 ··· 959 965 960 966 /* Set up Signal Frame */ 961 967 /* Put a Real Time Context onto stack */ 962 - rt_sf = get_sigframe(ka, regs, sizeof(*rt_sf), 1); 968 + rt_sf = get_sigframe(ka, get_tm_stackpointer(regs), sizeof(*rt_sf), 1); 963 969 addr = rt_sf; 964 970 if (unlikely(rt_sf == NULL)) 965 971 goto badframe; ··· 1397 1403 unsigned long tramp; 1398 1404 1399 1405 /* Set up Signal Frame */ 1400 - frame = get_sigframe(ka, regs, sizeof(*frame), 1); 1406 + frame = get_sigframe(ka, get_tm_stackpointer(regs), sizeof(*frame), 1); 1401 1407 if (unlikely(frame == NULL)) 1402 1408 goto badframe; 1403 1409 sc = (struct sigcontext __user *) &frame->sctx;
+7 -16
arch/powerpc/kernel/signal_64.c
··· 154 154 * As above, but Transactional Memory is in use, so deliver sigcontexts 155 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 158 - * 'normal' sigcontext registers with rolled-back register values such that a 159 - * simple signal handler sees a correct checkpointed register state. 160 - * If interested, a TM-aware sighandler can examine the transactional registers 161 - * in the 2nd sigcontext to determine the real origin of the signal. 157 + * To do this, we treclaim (done before entering here) to gather both sets of 158 + * registers and set up the 'normal' sigcontext registers with rolled-back 159 + * register values such that a simple signal handler sees a correct 160 + * checkpointed register state. If interested, a TM-aware sighandler can 161 + * examine the transactional registers in the 2nd sigcontext to determine the 162 + * real origin of the signal. 162 163 */ 163 164 static long setup_tm_sigcontexts(struct sigcontext __user *sc, 164 165 struct sigcontext __user *tm_sc, ··· 184 183 long err = 0; 185 184 186 185 BUG_ON(!MSR_TM_ACTIVE(regs->msr)); 187 - 188 - /* tm_reclaim rolls back all reg states, saving checkpointed (older) 189 - * GPRs to thread.ckpt_regs and (if used) FPRs to (newer) 190 - * thread.transact_fp and/or VRs to (newer) thread.transact_vr. 191 - * THEN we save out FP/VRs, if necessary, to the checkpointed (older) 192 - * thread.fr[]/vr[]s. The transactional (newer) GPRs are on the 193 - * stack, in *regs. 194 - */ 195 - tm_enable(); 196 - tm_reclaim(&current->thread, msr, TM_CAUSE_SIGNAL); 197 186 198 187 flush_fp_to_thread(current); 199 188 ··· 702 711 unsigned long newsp = 0; 703 712 long err = 0; 704 713 705 - frame = get_sigframe(ka, regs, sizeof(*frame), 0); 714 + frame = get_sigframe(ka, get_tm_stackpointer(regs), sizeof(*frame), 0); 706 715 if (unlikely(frame == NULL)) 707 716 goto badframe; 708 717
+29
arch/powerpc/kernel/traps.c
··· 53 53 #ifdef CONFIG_PPC64 54 54 #include <asm/firmware.h> 55 55 #include <asm/processor.h> 56 + #include <asm/tm.h> 56 57 #endif 57 58 #include <asm/kexec.h> 58 59 #include <asm/ppc-opcode.h> ··· 933 932 return 0; 934 933 } 935 934 935 + #ifdef CONFIG_PPC_TRANSACTIONAL_MEM 936 + static inline bool tm_abort_check(struct pt_regs *regs, int cause) 937 + { 938 + /* If we're emulating a load/store in an active transaction, we cannot 939 + * emulate it as the kernel operates in transaction suspended context. 940 + * We need to abort the transaction. This creates a persistent TM 941 + * abort so tell the user what caused it with a new code. 942 + */ 943 + if (MSR_TM_TRANSACTIONAL(regs->msr)) { 944 + tm_enable(); 945 + tm_abort(cause); 946 + return true; 947 + } 948 + return false; 949 + } 950 + #else 951 + static inline bool tm_abort_check(struct pt_regs *regs, int reason) 952 + { 953 + return false; 954 + } 955 + #endif 956 + 936 957 static int emulate_instruction(struct pt_regs *regs) 937 958 { 938 959 u32 instword; ··· 994 971 995 972 /* Emulate load/store string insn. */ 996 973 if ((instword & PPC_INST_STRING_GEN_MASK) == PPC_INST_STRING) { 974 + if (tm_abort_check(regs, 975 + TM_CAUSE_EMULATE | TM_CAUSE_PERSISTENT)) 976 + return -EINVAL; 997 977 PPC_WARN_EMULATED(string, regs); 998 978 return emulate_string_inst(regs, instword); 999 979 } ··· 1173 1147 /* We restore the interrupt state now */ 1174 1148 if (!arch_irq_disabled_regs(regs)) 1175 1149 local_irq_enable(); 1150 + 1151 + if (tm_abort_check(regs, TM_CAUSE_ALIGNMENT | TM_CAUSE_PERSISTENT)) 1152 + goto bail; 1176 1153 1177 1154 /* we don't implement logging of alignment exceptions */ 1178 1155 if (!(current->thread.align_ctl & PR_UNALIGN_SIGBUS))
+2
arch/powerpc/kvm/book3s_hv.c
··· 562 562 case H_CPPR: 563 563 case H_EOI: 564 564 case H_IPI: 565 + case H_IPOLL: 566 + case H_XIRR_X: 565 567 if (kvmppc_xics_enabled(vcpu)) { 566 568 ret = kvmppc_xics_hcall(vcpu, req); 567 569 break;
+2
arch/powerpc/kvm/book3s_pr_papr.c
··· 257 257 case H_CPPR: 258 258 case H_EOI: 259 259 case H_IPI: 260 + case H_IPOLL: 261 + case H_XIRR_X: 260 262 if (kvmppc_xics_enabled(vcpu)) 261 263 return kvmppc_h_pr_xics_hcall(vcpu, cmd); 262 264 break;
+29
arch/powerpc/kvm/book3s_xics.c
··· 650 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 670 static noinline void kvmppc_h_cppr(struct kvm_vcpu *vcpu, unsigned long cppr) 654 671 { 655 672 union kvmppc_icp_state old_state, new_state; ··· 803 786 /* Check if we have an ICP */ 804 787 if (!xics || !vcpu->arch.icp) 805 788 return H_HARDWARE; 789 + 790 + /* These requests don't have real-mode implementations at present */ 791 + switch (req) { 792 + case H_XIRR_X: 793 + res = kvmppc_h_xirr(vcpu); 794 + kvmppc_set_gpr(vcpu, 4, res); 795 + kvmppc_set_gpr(vcpu, 5, get_tb()); 796 + return rc; 797 + case H_IPOLL: 798 + rc = kvmppc_h_ipoll(vcpu, kvmppc_get_gpr(vcpu, 4)); 799 + return rc; 800 + } 806 801 807 802 /* Check for real mode returning too hard */ 808 803 if (xics->real_mode)
+11 -8
arch/powerpc/lib/copypage_power7.S
··· 28 28 * aligned we don't need to clear the bottom 7 bits of either 29 29 * address. 30 30 */ 31 - ori r9,r3,1 /* stream=1 */ 31 + ori r9,r3,1 /* stream=1 => to */ 32 32 33 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 36 #else 36 37 lis r7,0x0E00 /* depth=7 */ 37 - ori r7,r7,0x1000 /* units=32 */ 38 + ori r7,r7,0x1000 /* units/cachelines=32 */ 38 39 #endif 39 40 ori r10,r7,1 /* stream=1 */ 40 41 ··· 44 43 45 44 .machine push 46 45 .machine "power4" 47 - dcbt r0,r4,0b01000 48 - dcbt r0,r7,0b01010 49 - dcbtst r0,r9,0b01000 50 - dcbtst r0,r10,0b01010 46 + /* setup read stream 0 */ 47 + dcbt r0,r4,0b01000 /* addr from */ 48 + dcbt r0,r7,0b01010 /* length and depth from */ 49 + /* setup write stream 1 */ 50 + dcbtst r0,r9,0b01000 /* addr to */ 51 + dcbtst r0,r10,0b01010 /* length and depth to */ 51 52 eieio 52 - dcbt r0,r8,0b01010 /* GO */ 53 + dcbt r0,r8,0b01010 /* all streams GO */ 53 54 .machine pop 54 55 55 56 #ifdef CONFIG_ALTIVEC
+7 -5
arch/powerpc/lib/copyuser_power7.S
··· 318 318 319 319 .machine push 320 320 .machine "power4" 321 - dcbt r0,r6,0b01000 322 - dcbt r0,r7,0b01010 323 - dcbtst r0,r9,0b01000 324 - dcbtst r0,r10,0b01010 321 + /* setup read stream 0 */ 322 + dcbt r0,r6,0b01000 /* addr from */ 323 + dcbt r0,r7,0b01010 /* length and depth from */ 324 + /* setup write stream 1 */ 325 + dcbtst r0,r9,0b01000 /* addr to */ 326 + dcbtst r0,r10,0b01010 /* length and depth to */ 325 327 eieio 326 - dcbt r0,r8,0b01010 /* GO */ 328 + dcbt r0,r8,0b01010 /* all streams GO */ 327 329 .machine pop 328 330 329 331 beq cr1,.Lunwind_stack_nonvmx_copy
+22 -8
arch/powerpc/mm/hash_native_64.c
··· 336 336 337 337 hpte_v = hptep->v; 338 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 346 if (actual_psize < 0) { 340 - native_unlock_hpte(hptep); 341 - return -1; 347 + actual_psize = psize; 348 + ret = -1; 349 + goto err_out; 342 350 } 343 - /* Even if we miss, we need to invalidate the TLB */ 344 351 if (!HPTE_V_COMPARE(hpte_v, want_v)) { 345 352 DBG_LOW(" -> miss\n"); 346 353 ret = -1; ··· 357 350 hptep->r = (hptep->r & ~(HPTE_R_PP | HPTE_R_N)) | 358 351 (newpp & (HPTE_R_PP | HPTE_R_N | HPTE_R_C)); 359 352 } 353 + err_out: 360 354 native_unlock_hpte(hptep); 361 355 362 356 /* Ensure it is out of the tlb too. */ ··· 417 409 hptep = htab_address + slot; 418 410 actual_psize = hpte_actual_psize(hptep, psize); 419 411 if (actual_psize < 0) 420 - return; 412 + actual_psize = psize; 421 413 422 414 /* Update the HPTE */ 423 415 hptep->r = (hptep->r & ~(HPTE_R_PP | HPTE_R_N)) | ··· 445 437 hpte_v = hptep->v; 446 438 447 439 actual_psize = hpte_actual_psize(hptep, psize); 440 + /* 441 + * We need to invalidate the TLB always because hpte_remove doesn't do 442 + * a tlb invalidate. If a hash bucket gets full, we "evict" a more/less 443 + * random entry from it. When we do that we don't invalidate the TLB 444 + * (hpte_remove) because we assume the old translation is still 445 + * technically "valid". 446 + */ 448 447 if (actual_psize < 0) { 448 + actual_psize = psize; 449 449 native_unlock_hpte(hptep); 450 - local_irq_restore(flags); 451 - return; 450 + goto err_out; 452 451 } 453 - /* Even if we miss, we need to invalidate the TLB */ 454 452 if (!HPTE_V_COMPARE(hpte_v, want_v)) 455 453 native_unlock_hpte(hptep); 456 454 else 457 455 /* Invalidate the hpte. NOTE: this also unlocks it */ 458 456 hptep->v = 0; 459 457 458 + err_out: 460 459 /* Invalidate the TLB */ 461 460 tlbie(vpn, psize, actual_psize, ssize, local); 462 - 463 461 local_irq_restore(flags); 464 462 } 465 463
+31 -36
arch/powerpc/perf/core-book3s.c
··· 110 110 111 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 136 * If we're not doing instruction sampling, give them the SDAR 137 137 * (sampled data address). If we are doing instruction sampling, then 138 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 140 - * the [POWER7P_]MMCRA_SDAR_VALID bit in MMCRA. 139 + * pointed to by SIAR; this is indicated by the [POWER6_]MMCRA_SDSYNC, the 140 + * [POWER7P_]MMCRA_SDAR_VALID bit in MMCRA, or the SDAR_VALID bit in SIER. 141 141 */ 142 142 static inline void perf_get_data_addr(struct pt_regs *regs, u64 *addrp) 143 143 { 144 144 unsigned long mmcra = regs->dsisr; 145 - unsigned long sdsync; 145 + bool sdar_valid; 146 146 147 - if (ppmu->flags & PPMU_SIAR_VALID) 148 - sdsync = POWER7P_MMCRA_SDAR_VALID; 149 - else if (ppmu->flags & PPMU_ALT_SIPR) 150 - sdsync = POWER6_MMCRA_SDSYNC; 151 - else 152 - sdsync = MMCRA_SDSYNC; 147 + if (ppmu->flags & PPMU_HAS_SIER) 148 + sdar_valid = regs->dar & SIER_SDAR_VALID; 149 + else { 150 + unsigned long sdsync; 153 151 154 - if (!(mmcra & MMCRA_SAMPLE_ENABLE) || (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 + } 161 + 162 + if (!(mmcra & MMCRA_SAMPLE_ENABLE) || sdar_valid) 155 163 *addrp = mfspr(SPRN_SDAR); 156 164 } 157 165 ··· 189 181 return !!(regs->dsisr & sipr); 190 182 } 191 183 192 - static bool regs_no_sipr(struct pt_regs *regs) 193 - { 194 - return !!(regs->result & 2); 195 - } 196 - 197 184 static inline u32 perf_flags_from_msr(struct pt_regs *regs) 198 185 { 199 186 if (regs->msr & MSR_PR) ··· 211 208 * SIAR which should give slightly more reliable 212 209 * results 213 210 */ 214 - if (regs_no_sipr(regs)) { 211 + if (ppmu->flags & PPMU_NO_SIPR) { 215 212 unsigned long siar = mfspr(SPRN_SIAR); 216 213 if (siar >= PAGE_OFFSET) 217 214 return PERF_RECORD_MISC_KERNEL; ··· 242 239 int use_siar; 243 240 244 241 regs->dsisr = mmcra; 245 - regs->result = 0; 246 242 247 - if (ppmu->flags & PPMU_NO_SIPR) 248 - regs->result |= 2; 249 - 250 - /* 251 - * On power8 if we're in random sampling mode, the SIER is updated. 252 - * If we're in continuous sampling mode, we don't have SIPR. 253 - */ 254 - if (ppmu->flags & PPMU_HAS_SIER) { 255 - if (marked) 256 - regs->dar = mfspr(SPRN_SIER); 257 - else 258 - regs->result |= 2; 259 - } 260 - 243 + if (ppmu->flags & PPMU_HAS_SIER) 244 + regs->dar = mfspr(SPRN_SIER); 261 245 262 246 /* 263 247 * If this isn't a PMU exception (eg a software event) the SIAR is ··· 269 279 use_siar = 1; 270 280 else if ((ppmu->flags & PPMU_NO_CONT_SAMPLING)) 271 281 use_siar = 0; 272 - else if (!regs_no_sipr(regs) && regs_sipr(regs)) 282 + else if (!(ppmu->flags & PPMU_NO_SIPR) && regs_sipr(regs)) 273 283 use_siar = 0; 274 284 else 275 285 use_siar = 1; 276 286 277 - regs->result |= use_siar; 287 + regs->result = use_siar; 278 288 } 279 289 280 290 /* ··· 298 308 unsigned long mmcra = regs->dsisr; 299 309 int marked = mmcra & MMCRA_SAMPLE_ENABLE; 300 310 301 - if ((ppmu->flags & PPMU_SIAR_VALID) && marked) 302 - return mmcra & POWER7P_MMCRA_SIAR_VALID; 311 + if (marked) { 312 + if (ppmu->flags & PPMU_HAS_SIER) 313 + return regs->dar & SIER_SIAR_VALID; 314 + 315 + if (ppmu->flags & PPMU_SIAR_VALID) 316 + return mmcra & POWER7P_MMCRA_SIAR_VALID; 317 + } 303 318 304 319 return 1; 305 320 }
+2
arch/powerpc/platforms/pseries/Kconfig
··· 19 19 select ZLIB_DEFLATE 20 20 select PPC_DOORBELL 21 21 select HAVE_CONTEXT_TRACKING 22 + select HOTPLUG if SMP 23 + select HOTPLUG_CPU if SMP 22 24 default y 23 25 24 26 config PPC_SPLPAR
+2 -2
arch/powerpc/sysdev/mpic.c
··· 54 54 55 55 #ifdef CONFIG_PPC32 /* XXX for now */ 56 56 #ifdef CONFIG_IRQ_ALL_CPUS 57 - #define distribute_irqs (!(mpic->flags & MPIC_SINGLE_DEST_CPU)) 57 + #define distribute_irqs (1) 58 58 #else 59 59 #define distribute_irqs (0) 60 60 #endif ··· 1703 1703 * it differently, then we should make sure we also change the default 1704 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 1707 for (i = 0; i < mpic->num_sources ; i++) 1708 1708 mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), 1709 1709 mpic_irq_read(i, MPIC_INFO(IRQ_DESTINATION)) | msk);
+1 -1
arch/x86/crypto/crc32-pclmul_asm.S
··· 240 240 pand %xmm3, %xmm1 241 241 PCLMULQDQ 0x00, CONSTANT, %xmm1 242 242 pxor %xmm2, %xmm1 243 - pextrd $0x01, %xmm1, %eax 243 + PEXTRD 0x01, %xmm1, %eax 244 244 245 245 ret 246 246 ENDPROC(crc32_pclmul_le_16)
+1 -1
arch/x86/crypto/sha256-avx-asm.S
··· 118 118 119 119 _INP_END_SIZE = 8 120 120 _INP_SIZE = 8 121 - _XFER_SIZE = 8 121 + _XFER_SIZE = 16 122 122 _XMM_SAVE_SIZE = 0 123 123 124 124 _INP_END = 0
+1 -1
arch/x86/crypto/sha256-ssse3-asm.S
··· 111 111 112 112 _INP_END_SIZE = 8 113 113 _INP_SIZE = 8 114 - _XFER_SIZE = 8 114 + _XFER_SIZE = 16 115 115 _XMM_SAVE_SIZE = 0 116 116 117 117 _INP_END = 0
+72 -2
arch/x86/include/asm/inst.h
··· 9 9 10 10 #define REG_NUM_INVALID 100 11 11 12 - #define REG_TYPE_R64 0 13 - #define REG_TYPE_XMM 1 12 + #define REG_TYPE_R32 0 13 + #define REG_TYPE_R64 1 14 + #define REG_TYPE_XMM 2 14 15 #define REG_TYPE_INVALID 100 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 15 70 16 71 .macro R64_NUM opd r64 17 72 \opd = REG_NUM_INVALID 73 + #ifdef CONFIG_X86_64 18 74 .ifc \r64,%rax 19 75 \opd = 0 20 76 .endif ··· 119 63 .ifc \r64,%r15 120 64 \opd = 15 121 65 .endif 66 + #endif 122 67 .endm 123 68 124 69 .macro XMM_NUM opd xmm ··· 175 118 .endm 176 119 177 120 .macro REG_TYPE type reg 121 + R32_NUM reg_type_r32 \reg 178 122 R64_NUM reg_type_r64 \reg 179 123 XMM_NUM reg_type_xmm \reg 180 124 .if reg_type_r64 <> REG_NUM_INVALID 181 125 \type = REG_TYPE_R64 126 + .elseif reg_type_r32 <> REG_NUM_INVALID 127 + \type = REG_TYPE_R32 182 128 .elseif reg_type_xmm <> REG_NUM_INVALID 183 129 \type = REG_TYPE_XMM 184 130 .else ··· 219 159 PFX_REX clmul_opd1 clmul_opd2 220 160 .byte 0x0f, 0x3a, 0x44 221 161 MODRM 0xc0 clmul_opd1 clmul_opd2 162 + .byte \imm8 163 + .endm 164 + 165 + .macro PEXTRD imm8 xmm gpr 166 + R32_NUM extrd_opd1 \gpr 167 + XMM_NUM extrd_opd2 \xmm 168 + PFX_OPD_SIZE 169 + PFX_REX extrd_opd1 extrd_opd2 170 + .byte 0x0f, 0x3a, 0x16 171 + MODRM 0xc0 extrd_opd1 extrd_opd2 222 172 .byte \imm8 223 173 .endm 224 174
+4 -2
arch/x86/kernel/head_64.S
··· 115 115 movq %rdi, %rax 116 116 shrq $PUD_SHIFT, %rax 117 117 andl $(PTRS_PER_PUD-1), %eax 118 - movq %rdx, (4096+0)(%rbx,%rax,8) 119 - movq %rdx, (4096+8)(%rbx,%rax,8) 118 + movq %rdx, 4096(%rbx,%rax,8) 119 + incl %eax 120 + andl $(PTRS_PER_PUD-1), %eax 121 + movq %rdx, 4096(%rbx,%rax,8) 120 122 121 123 addq $8192, %rbx 122 124 movq %rdi, %rax
+5 -9
arch/x86/kernel/i387.c
··· 22 22 /* 23 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 25 * On others, we can do a kernel_fpu_begin/end() pair *ONLY* if that 33 26 * pair does nothing at all: the thread must not have fpu (so 34 27 * that we don't try to save the FPU state), and TS must 35 28 * be set (so that the clts/stts pair does nothing that is 36 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 34 static inline bool interrupted_kernel_fpu_idle(void) 39 35 { 40 36 if (use_eager_fpu()) 41 - return 0; 37 + return __thread_has_fpu(current); 42 38 43 39 return !__thread_has_fpu(current) && 44 40 (read_cr0() & X86_CR0_TS); ··· 74 78 struct task_struct *me = current; 75 79 76 80 if (__thread_has_fpu(me)) { 77 - __save_init_fpu(me); 78 81 __thread_clear_has_fpu(me); 82 + __save_init_fpu(me); 79 83 /* We do 'stts()' in __kernel_fpu_end() */ 80 84 } else if (!use_eager_fpu()) { 81 85 this_cpu_write(fpu_owner_task, NULL);
+1 -1
arch/x86/platform/efi/efi.c
··· 206 206 } 207 207 208 208 if (boot_used_size && !finished) { 209 - unsigned long size; 209 + unsigned long size = 0; 210 210 u32 attr; 211 211 efi_status_t s; 212 212 void *tmp;
+4 -6
arch/x86/xen/smp.c
··· 576 576 { 577 577 unsigned cpu; 578 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 582 return; 582 583 583 584 for_each_cpu_and(cpu, mask, cpu_online_mask) { 584 585 if (this_cpu == cpu) 585 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 592 void xen_send_IPI_allbutself(int vector) 592 593 { 593 - int xen_vector = xen_map_vector(vector); 594 - 595 - if (xen_vector >= 0) 596 - xen_send_IPI_mask_allbutself(cpu_online_mask, xen_vector); 594 + xen_send_IPI_mask_allbutself(cpu_online_mask, vector); 597 595 } 598 596 599 597 static irqreturn_t xen_call_function_interrupt(int irq, void *dev_id)
-1
arch/x86/xen/smp.h
··· 5 5 extern void xen_send_IPI_mask_allbutself(const struct cpumask *mask, 6 6 int vector); 7 7 extern void xen_send_IPI_allbutself(int vector); 8 - extern void physflat_send_IPI_allbutself(int vector); 9 8 extern void xen_send_IPI_all(int vector); 10 9 extern void xen_send_IPI_self(int vector); 11 10
-18
drivers/acpi/apei/cper.c
··· 250 250 static void cper_print_pcie(const char *pfx, const struct cper_sec_pcie *pcie, 251 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 253 if (pcie->validation_bits & CPER_PCIE_VALID_PORT_TYPE) 258 254 printk("%s""port_type: %d, %s\n", pfx, pcie->port_type, 259 255 pcie->port_type < ARRAY_SIZE(cper_pcie_port_type_strs) ? ··· 281 285 printk( 282 286 "%s""bridge: secondary_status: 0x%04x, control: 0x%04x\n", 283 287 pfx, pcie->bridge.secondary_status, pcie->bridge.control); 284 - #ifdef CONFIG_ACPI_APEI_PCIEAER 285 - dev = pci_get_domain_bus_and_slot(pcie->device_id.segment, 286 - pcie->device_id.bus, pcie->device_id.function); 287 - if (!dev) { 288 - pr_err("PCI AER Cannot get PCI device %04x:%02x:%02x.%d\n", 289 - pcie->device_id.segment, pcie->device_id.bus, 290 - pcie->device_id.slot, pcie->device_id.function); 291 - return; 292 - } 293 - if (pcie->validation_bits & CPER_PCIE_VALID_AER_INFO) 294 - cper_print_aer(pfx, dev, gdata->error_severity, 295 - (struct aer_capability_regs *) pcie->aer_info); 296 - pci_dev_put(dev); 297 - #endif 298 288 } 299 289 300 290 static const char *apei_estatus_section_flag_strs[] = {
+3 -1
drivers/acpi/apei/ghes.c
··· 454 454 aer_severity = cper_severity_to_aer(sev); 455 455 aer_recover_queue(pcie_err->device_id.segment, 456 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 }
+11 -1
drivers/clk/clk-si5351.c
··· 932 932 unsigned char reg; 933 933 unsigned char rdiv; 934 934 935 - if (hwdata->num > 5) 935 + if (hwdata->num <= 5) 936 936 reg = si5351_msynth_params_address(hwdata->num) + 2; 937 937 else 938 938 reg = SI5351_CLK6_7_OUTPUT_DIVIDER; ··· 1477 1477 return -EINVAL; 1478 1478 } 1479 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 1492 ret = of_clk_add_provider(client->dev.of_node, of_clk_src_onecell_get,
+1 -1
drivers/clk/clk-vt8500.c
··· 183 183 writel(divisor, cdev->div_reg); 184 184 vt8500_pmc_wait_busy(); 185 185 186 - spin_lock_irqsave(cdev->lock, flags); 186 + spin_unlock_irqrestore(cdev->lock, flags); 187 187 188 188 return 0; 189 189 }
+1
drivers/clk/mxs/clk-imx28.c
··· 10 10 */ 11 11 12 12 #include <linux/clk.h> 13 + #include <linux/clk/mxs.h> 13 14 #include <linux/clkdev.h> 14 15 #include <linux/err.h> 15 16 #include <linux/init.h>
+4 -2
drivers/clk/samsung/clk-exynos4.c
··· 791 791 GATE(smmu_pcie, "smmu_pcie", "aclk133", GATE_IP_FSYS, 18, 0, 0), 792 792 GATE(modemif, "modemif", "aclk100", GATE_IP_PERIL, 28, 0, 0), 793 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 796 GATE(hdmi_cec, "hdmi_cec", "aclk100", E4210_GATE_IP_PERIR, 11, 0, 0), 796 797 GATE(smmu_rotator, "smmu_rotator", "aclk200", 797 798 E4210_GATE_IP_IMAGE, 4, 0, 0), ··· 820 819 GATE(smmu_mdma, "smmu_mdma", "aclk200", E4X12_GATE_IP_IMAGE, 5, 0, 0), 821 820 GATE(mipi_hsi, "mipi_hsi", "aclk133", GATE_IP_FSYS, 10, 0, 0), 822 821 GATE(chipid, "chipid", "aclk100", E4X12_GATE_IP_PERIR, 0, 0, 0), 823 - GATE(sysreg, "sysreg", "aclk100", E4X12_GATE_IP_PERIR, 1, 0, 0), 822 + GATE(sysreg, "sysreg", "aclk100", E4X12_GATE_IP_PERIR, 1, 823 + CLK_IGNORE_UNUSED, 0), 824 824 GATE(hdmi_cec, "hdmi_cec", "aclk100", E4X12_GATE_IP_PERIR, 11, 0, 0), 825 825 GATE(sclk_mdnie0, "sclk_mdnie0", "div_mdnie0", 826 826 SRC_MASK_LCD0, 4, CLK_SET_RATE_PARENT, 0),
+7 -1
drivers/clk/ux500/clk-sysctrl.c
··· 145 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 155 clk->reg_sel[i] = reg_sel[i]; 150 156 clk->reg_bits[i] = reg_bits[i]; 151 157 clk->reg_mask[i] = reg_mask[i];
+1 -1
drivers/clk/ux500/u8500_clk.c
··· 325 325 clk = clk_reg_prcc_pclk("p3_pclk0", "per3clk", clkrst3_base, 326 326 BIT(0), 0); 327 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 330 clk = clk_reg_prcc_pclk("p3_pclk1", "per3clk", clkrst3_base, 331 331 BIT(1), 0);
+2 -2
drivers/crypto/caam/caamalg.c
··· 1154 1154 dst_nents = sg_count(req->dst, req->cryptlen, &dst_chained); 1155 1155 1156 1156 sgc = dma_map_sg_chained(jrdev, req->assoc, assoc_nents ? : 1, 1157 - DMA_BIDIRECTIONAL, assoc_chained); 1157 + DMA_TO_DEVICE, assoc_chained); 1158 1158 if (likely(req->src == req->dst)) { 1159 1159 sgc = dma_map_sg_chained(jrdev, req->src, src_nents ? : 1, 1160 1160 DMA_BIDIRECTIONAL, src_chained); ··· 1336 1336 dst_nents = sg_count(req->dst, req->cryptlen, &dst_chained); 1337 1337 1338 1338 sgc = dma_map_sg_chained(jrdev, req->assoc, assoc_nents ? : 1, 1339 - DMA_BIDIRECTIONAL, assoc_chained); 1339 + DMA_TO_DEVICE, assoc_chained); 1340 1340 if (likely(req->src == req->dst)) { 1341 1341 sgc = dma_map_sg_chained(jrdev, req->src, src_nents ? : 1, 1342 1342 DMA_BIDIRECTIONAL, src_chained);
+3 -5
drivers/firmware/efi/efivars.c
··· 523 523 struct efivar_entry *entry; 524 524 int err; 525 525 526 - entry = kzalloc(sizeof(*entry), GFP_KERNEL); 527 - if (!entry) 528 - return; 529 - 530 526 /* Add new sysfs entries */ 531 527 while (1) { 532 - memset(entry, 0, sizeof(*entry)); 528 + entry = kzalloc(sizeof(*entry), GFP_KERNEL); 529 + if (!entry) 530 + return; 533 531 534 532 err = efivar_init(efivar_update_sysfs_entry, entry, 535 533 true, false, &efivar_sysfs_list);
+18 -9
drivers/gpu/drm/exynos/exynos_drm_crtc.c
··· 48 48 unsigned int pipe; 49 49 unsigned int dpms; 50 50 enum exynos_crtc_mode mode; 51 + wait_queue_head_t pending_flip_queue; 52 + atomic_t pending_flip; 51 53 }; 52 54 53 55 static void exynos_drm_crtc_dpms(struct drm_crtc *crtc, int mode) ··· 61 59 if (exynos_crtc->dpms == mode) { 62 60 DRM_DEBUG_KMS("desired dpms mode is same as previous one.\n"); 63 61 return; 62 + } 63 + 64 + if (mode > DRM_MODE_DPMS_ON) { 65 + /* wait for the completion of page flip. */ 66 + wait_event(exynos_crtc->pending_flip_queue, 67 + atomic_read(&exynos_crtc->pending_flip) == 0); 68 + drm_vblank_off(crtc->dev, exynos_crtc->pipe); 64 69 } 65 70 66 71 exynos_drm_fn_encoder(crtc, &mode, exynos_drm_encoder_crtc_dpms); ··· 226 217 ret = drm_vblank_get(dev, exynos_crtc->pipe); 227 218 if (ret) { 228 219 DRM_DEBUG("failed to acquire vblank counter\n"); 229 - list_del(&event->base.link); 230 220 231 221 goto out; 232 222 } ··· 233 225 spin_lock_irq(&dev->event_lock); 234 226 list_add_tail(&event->base.link, 235 227 &dev_priv->pageflip_event_list); 228 + atomic_set(&exynos_crtc->pending_flip, 1); 236 229 spin_unlock_irq(&dev->event_lock); 237 230 238 231 crtc->fb = fb; ··· 353 344 354 345 exynos_crtc->pipe = nr; 355 346 exynos_crtc->dpms = DRM_MODE_DPMS_OFF; 347 + init_waitqueue_head(&exynos_crtc->pending_flip_queue); 348 + atomic_set(&exynos_crtc->pending_flip, 0); 356 349 exynos_crtc->plane = exynos_plane_init(dev, 1 << nr, true); 357 350 if (!exynos_crtc->plane) { 358 351 kfree(exynos_crtc); ··· 409 398 { 410 399 struct exynos_drm_private *dev_priv = dev->dev_private; 411 400 struct drm_pending_vblank_event *e, *t; 412 - struct timeval now; 401 + struct drm_crtc *drm_crtc = dev_priv->crtc[crtc]; 402 + struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(drm_crtc); 413 403 unsigned long flags; 414 404 415 405 DRM_DEBUG_KMS("%s\n", __FILE__); ··· 423 411 if (crtc != e->pipe) 424 412 continue; 425 413 426 - do_gettimeofday(&now); 427 - e->event.sequence = 0; 428 - e->event.tv_sec = now.tv_sec; 429 - e->event.tv_usec = now.tv_usec; 430 - 431 - list_move_tail(&e->base.link, &e->base.file_priv->event_list); 432 - wake_up_interruptible(&e->base.file_priv->event_wait); 414 + list_del(&e->base.link); 415 + drm_send_vblank_event(dev, -1, e); 433 416 drm_vblank_put(dev, crtc); 417 + atomic_set(&exynos_crtc->pending_flip, 0); 418 + wake_up(&exynos_crtc->pending_flip_queue); 434 419 } 435 420 436 421 spin_unlock_irqrestore(&dev->event_lock, flags);
+1 -1
drivers/gpu/drm/exynos/exynos_drm_fbdev.c
··· 182 182 183 183 helper->fb = exynos_drm_framebuffer_init(dev, &mode_cmd, 184 184 &exynos_gem_obj->base); 185 - if (IS_ERR_OR_NULL(helper->fb)) { 185 + if (IS_ERR(helper->fb)) { 186 186 DRM_ERROR("failed to create drm framebuffer.\n"); 187 187 ret = PTR_ERR(helper->fb); 188 188 goto err_destroy_gem;
+4 -8
drivers/gpu/drm/exynos/exynos_drm_fimc.c
··· 12 12 * 13 13 */ 14 14 #include <linux/kernel.h> 15 - #include <linux/mfd/syscon.h> 16 15 #include <linux/module.h> 17 16 #include <linux/platform_device.h> 17 + #include <linux/mfd/syscon.h> 18 18 #include <linux/regmap.h> 19 19 #include <linux/clk.h> 20 20 #include <linux/pm_runtime.h> ··· 1845 1845 } 1846 1846 1847 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 1849 IRQF_ONESHOT, "drm_fimc", ctx); 1850 1850 if (ret < 0) { 1851 1851 dev_err(dev, "failed to request irq.\n"); ··· 1854 1854 1855 1855 ret = fimc_setup_clocks(ctx); 1856 1856 if (ret < 0) 1857 - goto err_free_irq; 1857 + return ret; 1858 1858 1859 1859 ippdrv = &ctx->ippdrv; 1860 1860 ippdrv->ops[EXYNOS_DRM_OPS_SRC] = &fimc_src_ops; ··· 1884 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 1889 return 0; 1890 1890 ··· 1892 1892 pm_runtime_disable(dev); 1893 1893 err_put_clk: 1894 1894 fimc_put_clocks(ctx); 1895 - err_free_irq: 1896 - free_irq(ctx->irq, ctx); 1897 1895 1898 1896 return ret; 1899 1897 } ··· 1908 1910 fimc_put_clocks(ctx); 1909 1911 pm_runtime_set_suspended(dev); 1910 1912 pm_runtime_disable(dev); 1911 - 1912 - free_irq(ctx->irq, ctx); 1913 1913 1914 1914 return 0; 1915 1915 }
+5 -5
drivers/gpu/drm/exynos/exynos_drm_fimd.c
··· 885 885 886 886 DRM_DEBUG_KMS("%s\n", __FILE__); 887 887 888 - if (pdev->dev.of_node) { 888 + if (dev->of_node) { 889 889 pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); 890 890 if (!pdata) { 891 891 DRM_ERROR("memory allocation for pdata failed\n"); ··· 899 899 return ret; 900 900 } 901 901 } else { 902 - pdata = pdev->dev.platform_data; 902 + pdata = dev->platform_data; 903 903 if (!pdata) { 904 904 DRM_ERROR("no platform data specified\n"); 905 905 return -EINVAL; ··· 912 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 916 if (!ctx) 917 917 return -ENOMEM; 918 918 ··· 930 930 931 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 934 if (IS_ERR(ctx->regs)) 935 935 return PTR_ERR(ctx->regs); 936 936 ··· 942 942 943 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 946 0, "drm_fimd", ctx); 947 947 if (ret) { 948 948 dev_err(dev, "irq request failed.\n");
+3 -3
drivers/gpu/drm/exynos/exynos_drm_g2d.c
··· 1379 1379 struct exynos_drm_subdrv *subdrv; 1380 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 1383 if (!g2d) { 1384 1384 dev_err(dev, "failed to allocate driver data\n"); 1385 1385 return -ENOMEM; ··· 1417 1417 1418 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 1421 if (IS_ERR(g2d->regs)) { 1422 1422 ret = PTR_ERR(g2d->regs); 1423 1423 goto err_put_clk; ··· 1430 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 1434 "drm_g2d", g2d); 1435 1435 if (ret < 0) { 1436 1436 dev_err(dev, "irq request failed\n");
+3 -9
drivers/gpu/drm/exynos/exynos_drm_gsc.c
··· 1704 1704 } 1705 1705 1706 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 1708 IRQF_ONESHOT, "drm_gsc", ctx); 1709 1709 if (ret < 0) { 1710 1710 dev_err(dev, "failed to request irq.\n"); ··· 1725 1725 ret = gsc_init_prop_list(ippdrv); 1726 1726 if (ret < 0) { 1727 1727 dev_err(dev, "failed to init property list.\n"); 1728 - goto err_get_irq; 1728 + return ret; 1729 1729 } 1730 1730 1731 1731 DRM_DEBUG_KMS("%s:id[%d]ippdrv[0x%x]\n", __func__, ctx->id, ··· 1743 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 1748 return 0; 1749 1749 1750 1750 err_ippdrv_register: 1751 - devm_kfree(dev, ippdrv->prop_list); 1752 1751 pm_runtime_disable(dev); 1753 - err_get_irq: 1754 - free_irq(ctx->irq, ctx); 1755 1752 return ret; 1756 1753 } 1757 1754 ··· 1758 1761 struct gsc_context *ctx = get_gsc_context(dev); 1759 1762 struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; 1760 1763 1761 - devm_kfree(dev, ippdrv->prop_list); 1762 1764 exynos_drm_ippdrv_unregister(ippdrv); 1763 1765 mutex_destroy(&ctx->lock); 1764 1766 1765 1767 pm_runtime_set_suspended(dev); 1766 1768 pm_runtime_disable(dev); 1767 - 1768 - free_irq(ctx->irq, ctx); 1769 1769 1770 1770 return 0; 1771 1771 }
+1 -1
drivers/gpu/drm/exynos/exynos_drm_hdmi.c
··· 442 442 443 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 446 if (!ctx) { 447 447 DRM_LOG_KMS("failed to alloc common hdmi context.\n"); 448 448 return -ENOMEM;
+9 -9
drivers/gpu/drm/exynos/exynos_drm_ipp.c
··· 222 222 /* find ipp driver using idr */ 223 223 ippdrv = ipp_find_obj(&ctx->ipp_idr, &ctx->ipp_lock, 224 224 ipp_id); 225 - if (IS_ERR_OR_NULL(ippdrv)) { 225 + if (IS_ERR(ippdrv)) { 226 226 DRM_ERROR("not found ipp%d driver.\n", ipp_id); 227 227 return ippdrv; 228 228 } ··· 388 388 DRM_DEBUG_KMS("%s:prop_id[%d]\n", __func__, prop_id); 389 389 390 390 ippdrv = ipp_find_drv_by_handle(prop_id); 391 - if (IS_ERR_OR_NULL(ippdrv)) { 391 + if (IS_ERR(ippdrv)) { 392 392 DRM_ERROR("failed to get ipp driver.\n"); 393 393 return -EINVAL; 394 394 } ··· 492 492 493 493 /* find ipp driver using ipp id */ 494 494 ippdrv = ipp_find_driver(ctx, property); 495 - if (IS_ERR_OR_NULL(ippdrv)) { 495 + if (IS_ERR(ippdrv)) { 496 496 DRM_ERROR("failed to get ipp driver.\n"); 497 497 return -EINVAL; 498 498 } ··· 521 521 c_node->state = IPP_STATE_IDLE; 522 522 523 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 525 DRM_ERROR("failed to create start work.\n"); 526 526 goto err_clear; 527 527 } 528 528 529 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 531 DRM_ERROR("failed to create stop work.\n"); 532 532 goto err_free_start; 533 533 } 534 534 535 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 537 DRM_ERROR("failed to create event work.\n"); 538 538 goto err_free_stop; 539 539 } ··· 915 915 DRM_DEBUG_KMS("%s\n", __func__); 916 916 917 917 ippdrv = ipp_find_drv_by_handle(qbuf->prop_id); 918 - if (IS_ERR_OR_NULL(ippdrv)) { 918 + if (IS_ERR(ippdrv)) { 919 919 DRM_ERROR("failed to get ipp driver.\n"); 920 920 return -EFAULT; 921 921 } ··· 1909 1909 struct exynos_drm_subdrv *subdrv; 1910 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 1913 if (!ctx) 1914 1914 return -ENOMEM; 1915 1915 ··· 1963 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 1968 return 0; 1969 1969
+3 -10
drivers/gpu/drm/exynos/exynos_drm_rotator.c
··· 666 666 return rot->irq; 667 667 } 668 668 669 - ret = request_threaded_irq(rot->irq, NULL, rotator_irq_handler, 670 - IRQF_ONESHOT, "drm_rotator", rot); 669 + ret = devm_request_threaded_irq(dev, rot->irq, NULL, 670 + rotator_irq_handler, IRQF_ONESHOT, "drm_rotator", rot); 671 671 if (ret < 0) { 672 672 dev_err(dev, "failed to request irq\n"); 673 673 return ret; ··· 676 676 rot->clock = devm_clk_get(dev, "rotator"); 677 677 if (IS_ERR(rot->clock)) { 678 678 dev_err(dev, "failed to get clock\n"); 679 - ret = PTR_ERR(rot->clock); 680 - goto err_clk_get; 679 + return PTR_ERR(rot->clock); 681 680 } 682 681 683 682 pm_runtime_enable(dev); ··· 708 709 return 0; 709 710 710 711 err_ippdrv_register: 711 - devm_kfree(dev, ippdrv->prop_list); 712 712 pm_runtime_disable(dev); 713 - err_clk_get: 714 - free_irq(rot->irq, rot); 715 713 return ret; 716 714 } 717 715 ··· 718 722 struct rot_context *rot = dev_get_drvdata(dev); 719 723 struct exynos_drm_ippdrv *ippdrv = &rot->ippdrv; 720 724 721 - devm_kfree(dev, ippdrv->prop_list); 722 725 exynos_drm_ippdrv_unregister(ippdrv); 723 726 724 727 pm_runtime_disable(dev); 725 - 726 - free_irq(rot->irq, rot); 727 728 728 729 return 0; 729 730 }
+2 -2
drivers/gpu/drm/exynos/exynos_drm_vidi.c
··· 594 594 595 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 598 if (!ctx) 599 599 return -ENOMEM; 600 600 ··· 612 612 613 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 616 if (ret < 0) 617 617 DRM_INFO("failed to create connection sysfs.\n"); 618 618
+8 -13
drivers/gpu/drm/exynos/exynos_hdmi.c
··· 1946 1946 1947 1947 DRM_DEBUG_KMS("[%d]\n", __LINE__); 1948 1948 1949 - if (pdev->dev.of_node) { 1949 + if (dev->of_node) { 1950 1950 pdata = drm_hdmi_dt_parse_pdata(dev); 1951 1951 if (IS_ERR(pdata)) { 1952 1952 DRM_ERROR("failed to parse dt\n"); 1953 1953 return PTR_ERR(pdata); 1954 1954 } 1955 1955 } else { 1956 - pdata = pdev->dev.platform_data; 1956 + pdata = dev->platform_data; 1957 1957 } 1958 1958 1959 1959 if (!pdata) { ··· 1961 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 1965 GFP_KERNEL); 1966 1966 if (!drm_hdmi_ctx) { 1967 1967 DRM_ERROR("failed to allocate common hdmi context.\n"); 1968 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 1972 GFP_KERNEL); 1973 1973 if (!hdata) { 1974 1974 DRM_ERROR("out of memory\n"); ··· 1985 1985 if (dev->of_node) { 1986 1986 const struct of_device_id *match; 1987 1987 match = of_match_node(of_match_ptr(hdmi_match_types), 1988 - pdev->dev.of_node); 1988 + dev->of_node); 1989 1989 if (match == NULL) 1990 1990 return -ENODEV; 1991 1991 hdata->type = (enum hdmi_type)match->data; ··· 2005 2005 } 2006 2006 2007 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 2009 if (IS_ERR(hdata->regs)) 2010 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 2013 if (ret) { 2014 2014 DRM_ERROR("failed to request HPD gpio\n"); 2015 2015 return ret; ··· 2041 2041 2042 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 2045 hdmi_irq_thread, IRQF_TRIGGER_RISING | 2046 2046 IRQF_TRIGGER_FALLING | IRQF_ONESHOT, 2047 2047 "hdmi", drm_hdmi_ctx); ··· 2070 2070 static int hdmi_remove(struct platform_device *pdev) 2071 2071 { 2072 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 2074 DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__); 2077 2075 2078 2076 pm_runtime_disable(dev); 2079 - 2080 - free_irq(hdata->irq, hdata); 2081 - 2082 2077 2083 2078 /* hdmiphy i2c driver */ 2084 2079 i2c_del_driver(&hdmiphy_driver);
+7 -7
drivers/gpu/drm/exynos/exynos_mixer.c
··· 1061 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 1065 resource_size(res)); 1066 1066 if (mixer_res->mixer_regs == NULL) { 1067 1067 dev_err(dev, "register mapping failed.\n"); ··· 1074 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 1078 0, "drm_mixer", ctx); 1079 1079 if (ret) { 1080 1080 dev_err(dev, "request interrupt failed.\n"); ··· 1118 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 1122 resource_size(res)); 1123 1123 if (mixer_res->vp_regs == NULL) { 1124 1124 dev_err(dev, "register mapping failed.\n"); ··· 1169 1169 1170 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 1173 GFP_KERNEL); 1174 1174 if (!drm_hdmi_ctx) { 1175 1175 DRM_ERROR("failed to allocate common hdmi context.\n"); 1176 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 1180 if (!ctx) { 1181 1181 DRM_ERROR("failed to alloc mixer context.\n"); 1182 1182 return -ENOMEM; ··· 1187 1187 if (dev->of_node) { 1188 1188 const struct of_device_id *match; 1189 1189 match = of_match_node(of_match_ptr(mixer_match_types), 1190 - pdev->dev.of_node); 1190 + dev->of_node); 1191 1191 drv = (struct mixer_drv_data *)match->data; 1192 1192 } else { 1193 1193 drv = (struct mixer_drv_data *) 1194 1194 platform_get_device_id(pdev)->driver_data; 1195 1195 } 1196 1196 1197 - ctx->dev = &pdev->dev; 1197 + ctx->dev = dev; 1198 1198 ctx->parent_ctx = (void *)drm_hdmi_ctx; 1199 1199 drm_hdmi_ctx->ctx = (void *)ctx; 1200 1200 ctx->vp_enabled = drv->is_vp_enabled;
+35 -11
drivers/gpu/drm/i915/i915_drv.c
··· 364 364 INTEL_VGA_DEVICE(0x016a, &intel_ivybridge_d_info), /* GT2 server */ 365 365 INTEL_VGA_DEVICE(0x0402, &intel_haswell_d_info), /* GT1 desktop */ 366 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 368 INTEL_VGA_DEVICE(0x040a, &intel_haswell_d_info), /* GT1 server */ 369 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 371 INTEL_VGA_DEVICE(0x0406, &intel_haswell_m_info), /* GT1 mobile */ 372 372 INTEL_VGA_DEVICE(0x0416, &intel_haswell_m_info), /* GT2 mobile */ 373 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 380 INTEL_VGA_DEVICE(0x0C02, &intel_haswell_d_info), /* SDV GT1 desktop */ 375 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 383 INTEL_VGA_DEVICE(0x0C0A, &intel_haswell_d_info), /* SDV GT1 server */ 378 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 386 INTEL_VGA_DEVICE(0x0C06, &intel_haswell_m_info), /* SDV GT1 mobile */ 381 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 395 INTEL_VGA_DEVICE(0x0A02, &intel_haswell_d_info), /* ULT GT1 desktop */ 384 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 398 INTEL_VGA_DEVICE(0x0A0A, &intel_haswell_d_info), /* ULT GT1 server */ 387 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 401 INTEL_VGA_DEVICE(0x0A06, &intel_haswell_m_info), /* ULT GT1 mobile */ 390 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 410 INTEL_VGA_DEVICE(0x0D02, &intel_haswell_d_info), /* CRW GT1 desktop */ 393 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 413 INTEL_VGA_DEVICE(0x0D0A, &intel_haswell_d_info), /* CRW GT1 server */ 396 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 416 INTEL_VGA_DEVICE(0x0D06, &intel_haswell_m_info), /* CRW GT1 mobile */ 399 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 425 INTEL_VGA_DEVICE(0x0f30, &intel_valleyview_m_info), 402 426 INTEL_VGA_DEVICE(0x0f31, &intel_valleyview_m_info), 403 427 INTEL_VGA_DEVICE(0x0f32, &intel_valleyview_m_info),
+15
drivers/gpu/drm/i915/i915_drv.h
··· 1943 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 1961 #endif
+1 -1
drivers/gpu/drm/i915/i915_gem.c
··· 1003 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 1008 if (WARN_ON(!ring->irq_get(ring))) 1009 1009 return -ENODEV;
+32 -17
drivers/gpu/drm/i915/intel_display.c
··· 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 8158 static void 8144 8159 intel_set_config_compute_mode_changes(struct drm_mode_set *set, 8145 8160 struct intel_set_config *config) ··· 8162 8147 8163 8148 /* We should be able to check here if the fb has the same properties 8164 8149 * and then just flip_or_move it */ 8165 - if (set->crtc->fb != set->fb) { 8150 + if (set->connectors != NULL && 8151 + is_crtc_connector_off(set->crtc, *set->connectors, 8152 + set->num_connectors)) { 8153 + config->mode_changed = true; 8154 + } else if (set->crtc->fb != set->fb) { 8166 8155 /* If we have no fb then treat it as a full mode set */ 8167 8156 if (set->crtc->fb == NULL) { 8168 8157 DRM_DEBUG_KMS("crtc has no fb, full mode set\n"); ··· 8176 8157 } else if (set->fb->pixel_format != 8177 8158 set->crtc->fb->pixel_format) { 8178 8159 config->mode_changed = true; 8179 - } else 8160 + } else { 8180 8161 config->fb_changed = true; 8162 + } 8181 8163 } 8182 8164 8183 8165 if (set->fb && (set->x != set->crtc->x || set->y != set->crtc->y)) ··· 8352 8332 8353 8333 ret = intel_set_mode(set->crtc, set->mode, 8354 8334 set->x, set->y, set->fb); 8355 - if (ret) { 8356 - DRM_ERROR("failed to set mode on [CRTC:%d], err = %d\n", 8357 - set->crtc->base.id, ret); 8358 - goto fail; 8359 - } 8360 8335 } else if (config->fb_changed) { 8361 8336 intel_crtc_wait_for_pending_flips(set->crtc); 8362 8337 ··· 8359 8344 set->x, set->y, set->fb); 8360 8345 } 8361 8346 8362 - intel_set_config_free(config); 8363 - 8364 - return 0; 8365 - 8347 + if (ret) { 8348 + DRM_ERROR("failed to set mode on [CRTC:%d], err = %d\n", 8349 + set->crtc->base.id, ret); 8366 8350 fail: 8367 - intel_set_config_restore_state(dev, config); 8351 + intel_set_config_restore_state(dev, config); 8368 8352 8369 - /* Try to restore the config */ 8370 - if (config->mode_changed && 8371 - intel_set_mode(save_set.crtc, save_set.mode, 8372 - save_set.x, save_set.y, save_set.fb)) 8373 - DRM_ERROR("failed to restore config after modeset failure\n"); 8353 + /* Try to restore the config */ 8354 + if (config->mode_changed && 8355 + intel_set_mode(save_set.crtc, save_set.mode, 8356 + save_set.x, save_set.y, save_set.fb)) 8357 + DRM_ERROR("failed to restore config after modeset failure\n"); 8358 + } 8374 8359 8375 8360 out_config: 8376 8361 intel_set_config_free(config);
+1 -1
drivers/gpu/drm/i915/intel_dp.c
··· 303 303 #define C (((status = I915_READ_NOTRACE(ch_ctl)) & DP_AUX_CH_CTL_SEND_BUSY) == 0) 304 304 if (has_aux_irq) 305 305 done = wait_event_timeout(dev_priv->gmbus_wait_queue, C, 306 - msecs_to_jiffies(10)); 306 + msecs_to_jiffies_timeout(10)); 307 307 else 308 308 done = wait_for_atomic(C, 10) == 0; 309 309 if (!done)
+3 -2
drivers/gpu/drm/i915/intel_i2c.c
··· 228 228 * need to wake up periodically and check that ourselves. */ 229 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 232 prepare_to_wait(&dev_priv->gmbus_wait_queue, &wait, 233 233 TASK_UNINTERRUPTIBLE); 234 234 ··· 263 263 /* Important: The hw handles only the first bit, so set only one! */ 264 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 269 I915_WRITE(GMBUS4 + reg_offset, 0); 269 270
+2 -11
drivers/gpu/drm/nouveau/nouveau_display.c
··· 638 638 } 639 639 640 640 s = list_first_entry(&fctx->flip, struct nouveau_page_flip_state, head); 641 - if (s->event) { 642 - struct drm_pending_vblank_event *e = 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 - } 641 + if (s->event) 642 + drm_send_vblank_event(dev, -1, s->event); 652 643 653 644 list_del(&s->head); 654 645 if (ps)
+3
drivers/gpu/drm/omapdrm/omap_drv.c
··· 649 649 650 650 static int pdev_probe(struct platform_device *device) 651 651 { 652 + if (omapdss_is_initialized() == false) 653 + return -EPROBE_DEFER; 654 + 652 655 DBG("%s", device->name); 653 656 return drm_platform_init(&omap_drm_driver, device); 654 657 }
+1
drivers/gpu/drm/qxl/Kconfig
··· 4 4 select FB_SYS_FILLRECT 5 5 select FB_SYS_COPYAREA 6 6 select FB_SYS_IMAGEBLIT 7 + select FB_DEFERRED_IO 7 8 select DRM_KMS_HELPER 8 9 select DRM_TTM 9 10 help
+2 -2
drivers/gpu/drm/qxl/qxl_ioctl.c
··· 151 151 struct qxl_bo *cmd_bo; 152 152 int release_type; 153 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 156 if (DRM_COPY_FROM_USER(&user_cmd, &commands[cmd_num], 157 157 sizeof(user_cmd))) ··· 193 193 194 194 for (i = 0 ; i < user_cmd.relocs_num; ++i) { 195 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 197 sizeof(reloc))) { 198 198 qxl_bo_list_unreserve(&reloc_list, true); 199 199 qxl_release_unreserve(qdev, release);
+5 -4
drivers/gpu/drm/qxl/qxl_kms.c
··· 128 128 129 129 qdev->vram_mapping = io_mapping_create_wc(qdev->vram_base, pci_resource_len(pdev, 0)); 130 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", 132 - (void *)qdev->vram_base, (void *)pci_resource_end(pdev, 0), 131 + DRM_DEBUG_KMS("qxl: vram %llx-%llx(%dM %dk), surface %llx-%llx(%dM %dk)\n", 132 + (unsigned long long)qdev->vram_base, 133 + (unsigned long long)pci_resource_end(pdev, 0), 133 134 (int)pci_resource_len(pdev, 0) / 1024 / 1024, 134 135 (int)pci_resource_len(pdev, 0) / 1024, 135 - (void *)qdev->surfaceram_base, 136 - (void *)pci_resource_end(pdev, 1), 136 + (unsigned long long)qdev->surfaceram_base, 137 + (unsigned long long)pci_resource_end(pdev, 1), 137 138 (int)qdev->surfaceram_size / 1024 / 1024, 138 139 (int)qdev->surfaceram_size / 1024); 139 140
+3 -7
drivers/gpu/drm/radeon/evergreen.c
··· 4999 4999 5000 5000 void evergreen_pcie_gen2_enable(struct radeon_device *rdev) 5001 5001 { 5002 - u32 link_width_cntl, speed_cntl, mask; 5003 - int ret; 5002 + u32 link_width_cntl, speed_cntl; 5004 5003 5005 5004 if (radeon_pcie_gen2 == 0) 5006 5005 return; ··· 5014 5015 if (ASIC_IS_X2(rdev)) 5015 5016 return; 5016 5017 5017 - ret = drm_pcie_get_speed_cap_mask(rdev->ddev, &mask); 5018 - if (ret != 0) 5019 - return; 5020 - 5021 - if (!(mask & DRM_PCIE_SPEED_50)) 5018 + if ((rdev->pdev->bus->max_bus_speed != PCIE_SPEED_5_0GT) && 5019 + (rdev->pdev->bus->max_bus_speed != PCIE_SPEED_8_0GT)) 5022 5020 return; 5023 5021 5024 5022 speed_cntl = RREG32_PCIE_PORT(PCIE_LC_SPEED_CNTL);
+2 -7
drivers/gpu/drm/radeon/r600.c
··· 4631 4631 { 4632 4632 u32 link_width_cntl, lanes, speed_cntl, training_cntl, tmp; 4633 4633 u16 link_cntl2; 4634 - u32 mask; 4635 - int ret; 4636 4634 4637 4635 if (radeon_pcie_gen2 == 0) 4638 4636 return; ··· 4649 4651 if (rdev->family <= CHIP_R600) 4650 4652 return; 4651 4653 4652 - ret = drm_pcie_get_speed_cap_mask(rdev->ddev, &mask); 4653 - if (ret != 0) 4654 - return; 4655 - 4656 - if (!(mask & DRM_PCIE_SPEED_50)) 4654 + if ((rdev->pdev->bus->max_bus_speed != PCIE_SPEED_5_0GT) && 4655 + (rdev->pdev->bus->max_bus_speed != PCIE_SPEED_8_0GT)) 4657 4656 return; 4658 4657 4659 4658 speed_cntl = RREG32_PCIE_PORT(PCIE_LC_SPEED_CNTL);
+16 -11
drivers/gpu/drm/radeon/radeon_device.c
··· 467 467 { 468 468 uint32_t reg; 469 469 470 + /* required for EFI mode on macbook2,1 which uses an r5xx asic */ 470 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 474 return false; 473 475 476 + if (ASIC_IS_NODCE(rdev)) 477 + goto check_memsize; 478 + 474 479 /* first check CRTCs */ 475 - if (ASIC_IS_DCE41(rdev)) { 480 + if (ASIC_IS_DCE4(rdev)) { 476 481 reg = RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET) | 477 482 RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET); 478 - if (reg & EVERGREEN_CRTC_MASTER_EN) 479 - return true; 480 - } else if (ASIC_IS_DCE4(rdev)) { 481 - reg = RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET) | 482 - RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET) | 483 - RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC2_REGISTER_OFFSET) | 484 - RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC3_REGISTER_OFFSET) | 485 - RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC4_REGISTER_OFFSET) | 486 - RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC5_REGISTER_OFFSET); 483 + if (rdev->num_crtc >= 4) { 484 + reg |= RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC2_REGISTER_OFFSET) | 485 + RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC3_REGISTER_OFFSET); 486 + } 487 + if (rdev->num_crtc >= 6) { 488 + reg |= RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC4_REGISTER_OFFSET) | 489 + RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC5_REGISTER_OFFSET); 490 + } 487 491 if (reg & EVERGREEN_CRTC_MASTER_EN) 488 492 return true; 489 493 } else if (ASIC_IS_AVIVO(rdev)) { ··· 504 500 } 505 501 } 506 502 503 + check_memsize: 507 504 /* then check MEM_SIZE, in case the crtcs are off */ 508 505 if (rdev->family >= CHIP_R600) 509 506 reg = RREG32(R600_CONFIG_MEMSIZE);
+3 -10
drivers/gpu/drm/radeon/radeon_display.c
··· 271 271 { 272 272 struct radeon_crtc *radeon_crtc = rdev->mode_info.crtcs[crtc_id]; 273 273 struct radeon_unpin_work *work; 274 - struct drm_pending_vblank_event *e; 275 - struct timeval now; 276 274 unsigned long flags; 277 275 u32 update_pending; 278 276 int vpos, hpos; ··· 326 328 radeon_crtc->unpin_work = NULL; 327 329 328 330 /* wakeup userspace */ 329 - if (work->event) { 330 - e = work->event; 331 - e->event.sequence = drm_vblank_count_and_time(rdev->ddev, crtc_id, &now); 332 - e->event.tv_sec = now.tv_sec; 333 - e->event.tv_usec = now.tv_usec; 334 - list_add_tail(&e->base.link, &e->base.file_priv->event_list); 335 - wake_up_interruptible(&e->base.file_priv->event_wait); 336 - } 331 + if (work->event) 332 + drm_send_vblank_event(rdev->ddev, crtc_id, work->event); 333 + 337 334 spin_unlock_irqrestore(&rdev->ddev->event_lock, flags); 338 335 339 336 drm_vblank_put(rdev->ddev, radeon_crtc->crtc_id);
+3 -10
drivers/gpu/drm/radeon/rv770.c
··· 862 862 chip_id = 0x0100000b; 863 863 break; 864 864 case CHIP_SUMO: 865 - chip_id = 0x0100000c; 866 - break; 867 865 case CHIP_SUMO2: 868 - chip_id = 0x0100000d; 866 + chip_id = 0x0100000c; 869 867 break; 870 868 case CHIP_PALM: 871 869 chip_id = 0x0100000e; ··· 2111 2113 { 2112 2114 u32 link_width_cntl, lanes, speed_cntl, tmp; 2113 2115 u16 link_cntl2; 2114 - u32 mask; 2115 - int ret; 2116 2116 2117 2117 if (radeon_pcie_gen2 == 0) 2118 2118 return; ··· 2125 2129 if (ASIC_IS_X2(rdev)) 2126 2130 return; 2127 2131 2128 - ret = drm_pcie_get_speed_cap_mask(rdev->ddev, &mask); 2129 - if (ret != 0) 2130 - return; 2131 - 2132 - if (!(mask & DRM_PCIE_SPEED_50)) 2132 + if ((rdev->pdev->bus->max_bus_speed != PCIE_SPEED_5_0GT) && 2133 + (rdev->pdev->bus->max_bus_speed != PCIE_SPEED_8_0GT)) 2133 2134 return; 2134 2135 2135 2136 DRM_INFO("enabling PCIE gen 2 link speeds, disable with radeon.pcie_gen2=0\n");
+1 -1
drivers/gpu/drm/radeon/si.c
··· 2616 2616 default: 2617 2617 rdev->config.si.max_shader_engines = 1; 2618 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 2620 rdev->config.si.max_sh_per_se = 2; 2621 2621 rdev->config.si.max_backends_per_se = 4; 2622 2622 rdev->config.si.max_texture_channel_caches = 4;
+4 -15
drivers/gpu/drm/shmobile/shmob_drm_crtc.c
··· 451 451 { 452 452 struct drm_pending_vblank_event *event; 453 453 struct drm_device *dev = scrtc->crtc.dev; 454 - struct timeval vblanktime; 455 454 unsigned long flags; 456 455 457 456 spin_lock_irqsave(&dev->event_lock, flags); 458 457 event = scrtc->event; 459 458 scrtc->event = NULL; 459 + if (event) { 460 + drm_send_vblank_event(dev, 0, event); 461 + drm_vblank_put(dev, 0); 462 + } 460 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 466 static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc,
+25 -9
drivers/infiniband/ulp/srpt/ib_srpt.c
··· 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 2251 * srpt_drain_channel() - Drain a channel by resetting the IB queue pair. 2231 2252 * @cm_id: Pointer to the CM ID of the channel to be drained. 2232 2253 * ··· 2285 2264 spin_unlock_irq(&sdev->spinlock); 2286 2265 2287 2266 if (do_reset) { 2267 + if (ch->sess) 2268 + srpt_shutdown_session(ch->sess); 2269 + 2288 2270 ret = srpt_ch_qp_err(ch); 2289 2271 if (ret < 0) 2290 2272 printk(KERN_ERR "Setting queue pair in error state" ··· 2352 2328 se_sess = ch->sess; 2353 2329 BUG_ON(!se_sess); 2354 2330 2355 - target_wait_for_sess_cmds(se_sess, 0); 2331 + target_wait_for_sess_cmds(se_sess); 2356 2332 2357 2333 transport_deregister_session_configfs(se_sess); 2358 2334 transport_deregister_session(se_sess); ··· 3488 3464 spin_lock_irqsave(&ch->spinlock, flags); 3489 3465 list_add(&ioctx->free_list, &ch->free_list); 3490 3466 spin_unlock_irqrestore(&ch->spinlock, flags); 3491 - } 3492 - 3493 - /** 3494 - * srpt_shutdown_session() - Whether or not a session may be shut down. 3495 - */ 3496 - static int srpt_shutdown_session(struct se_session *se_sess) 3497 - { 3498 - return true; 3499 3467 } 3500 3468 3501 3469 /**
+1
drivers/infiniband/ulp/srpt/ib_srpt.h
··· 325 325 u8 sess_name[36]; 326 326 struct work_struct release_work; 327 327 struct completion *release_done; 328 + bool in_shutdown; 328 329 }; 329 330 330 331 /**
+1 -1
drivers/media/pci/zoran/zoran.h
··· 176 176 177 177 struct zoran_mapping { 178 178 struct zoran_fh *fh; 179 - int count; 179 + atomic_t count; 180 180 }; 181 181 182 182 struct zoran_buffer {
+8 -7
drivers/media/pci/zoran/zoran_driver.c
··· 2803 2803 zoran_vm_open (struct vm_area_struct *vma) 2804 2804 { 2805 2805 struct zoran_mapping *map = vma->vm_private_data; 2806 - 2807 - map->count++; 2806 + atomic_inc(&map->count); 2808 2807 } 2809 2808 2810 2809 static void ··· 2814 2815 struct zoran *zr = fh->zr; 2815 2816 int i; 2816 2817 2817 - if (--map->count > 0) 2818 + if (!atomic_dec_and_mutex_lock(&map->count, &zr->resource_lock)) 2818 2819 return; 2819 2820 2820 2821 dprintk(3, KERN_INFO "%s: %s - munmap(%s)\n", ZR_DEVNAME(zr), ··· 2827 2828 kfree(map); 2828 2829 2829 2830 /* Any buffers still mapped? */ 2830 - for (i = 0; i < fh->buffers.num_buffers; i++) 2831 - if (fh->buffers.buffer[i].map) 2831 + for (i = 0; i < fh->buffers.num_buffers; i++) { 2832 + if (fh->buffers.buffer[i].map) { 2833 + mutex_unlock(&zr->resource_lock); 2832 2834 return; 2835 + } 2836 + } 2833 2837 2834 2838 dprintk(3, KERN_INFO "%s: %s - free %s buffers\n", ZR_DEVNAME(zr), 2835 2839 __func__, mode_name(fh->map_mode)); 2836 2840 2837 - mutex_lock(&zr->resource_lock); 2838 2841 2839 2842 if (fh->map_mode == ZORAN_MAP_MODE_RAW) { 2840 2843 if (fh->buffers.active != ZORAN_FREE) { ··· 2940 2939 goto mmap_unlock_and_return; 2941 2940 } 2942 2941 map->fh = fh; 2943 - map->count = 1; 2942 + atomic_set(&map->count, 1); 2944 2943 2945 2944 vma->vm_ops = &zoran_vm_ops; 2946 2945 vma->vm_flags |= VM_DONTEXPAND;
+3
drivers/media/platform/omap/omap_vout.c
··· 2150 2150 struct omap_dss_device *def_display; 2151 2151 struct omap2video_device *vid_dev = NULL; 2152 2152 2153 + if (omapdss_is_initialized() == false) 2154 + return -EPROBE_DEFER; 2155 + 2153 2156 ret = omapdss_compat_init(); 2154 2157 if (ret) { 2155 2158 dev_err(&pdev->dev, "failed to init dss\n");
+5 -4
drivers/parisc/lba_pci.c
··· 668 668 BUG(); 669 669 } 670 670 671 - if (ldev->hba.elmmio_space.start) { 671 + if (ldev->hba.elmmio_space.flags) { 672 672 err = request_resource(&iomem_resource, 673 673 &(ldev->hba.elmmio_space)); 674 674 if (err < 0) { ··· 993 993 994 994 case PAT_LMMIO: 995 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 997 sprintf(lba_dev->hba.lmmio_name, 998 998 "PCI%02x LMMIO", 999 999 (int)lba_dev->hba.bus_num.start); ··· 1001 1001 io->start; 1002 1002 r = &lba_dev->hba.lmmio_space; 1003 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 1005 sprintf(lba_dev->hba.elmmio_name, 1006 1006 "PCI%02x ELMMIO", 1007 1007 (int)lba_dev->hba.bus_num.start); ··· 1096 1096 r->name = "LBA PCI Busses"; 1097 1097 r->start = lba_num & 0xff; 1098 1098 r->end = (lba_num>>8) & 0xff; 1099 + r->flags = IORESOURCE_BUS; 1099 1100 1100 1101 /* Set up local PCI Bus resources - we don't need them for 1101 1102 ** Legacy boxes but it's nice to see in /proc/iomem. ··· 1495 1494 1496 1495 pci_add_resource_offset(&resources, &lba_dev->hba.io_space, 1497 1496 HBA_PORT_BASE(lba_dev->hba.hba_num)); 1498 - if (lba_dev->hba.elmmio_space.start) 1497 + if (lba_dev->hba.elmmio_space.flags) 1499 1498 pci_add_resource_offset(&resources, &lba_dev->hba.elmmio_space, 1500 1499 lba_dev->hba.lmmio_space_offset); 1501 1500 if (lba_dev->hba.lmmio_space.flags)
+1 -1
drivers/parport/Kconfig
··· 71 71 72 72 config PARPORT_PC_SUPERIO 73 73 bool "SuperIO chipset support" 74 - depends on PARPORT_PC 74 + depends on PARPORT_PC && !PARISC 75 75 help 76 76 Saying Y here enables some probes for Super-IO chipsets in order to 77 77 find out things like base addresses, IRQ lines and DMA channels. It
+3 -3
drivers/parport/parport_gsc.c
··· 234 234 235 235 struct parport *parport_gsc_probe_port(unsigned long base, 236 236 unsigned long base_hi, int irq, 237 - int dma, struct pci_dev *dev) 237 + int dma, struct parisc_device *padev) 238 238 { 239 239 struct parport_gsc_private *priv; 240 240 struct parport_operations *ops; ··· 258 258 priv->ctr_writable = 0xff; 259 259 priv->dma_buf = 0; 260 260 priv->dma_handle = 0; 261 - priv->dev = dev; 262 261 p->base = base; 263 262 p->base_hi = base_hi; 264 263 p->irq = irq; ··· 281 282 return NULL; 282 283 } 283 284 285 + p->dev = &padev->dev; 284 286 p->base_hi = base_hi; 285 287 p->modes = tmp.modes; 286 288 p->size = (p->modes & PARPORT_MODE_EPP)?8:3; ··· 373 373 } 374 374 375 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 377 if (p) 378 378 parport_count++; 379 379 dev_set_drvdata(&dev->dev, p);
+1 -1
drivers/parport/parport_gsc.h
··· 217 217 extern struct parport *parport_gsc_probe_port(unsigned long base, 218 218 unsigned long base_hi, 219 219 int irq, int dma, 220 - struct pci_dev *dev); 220 + struct parisc_device *padev); 221 221 222 222 #endif /* __DRIVERS_PARPORT_PARPORT_GSC_H */
+4 -1
drivers/pci/pcie/aer/aerdrv_core.c
··· 580 580 u8 devfn; 581 581 u16 domain; 582 582 int severity; 583 + struct aer_capability_regs *regs; 583 584 }; 584 585 585 586 static DEFINE_KFIFO(aer_recover_ring, struct aer_recover_entry, ··· 594 593 static DECLARE_WORK(aer_recover_work, aer_recover_work_func); 595 594 596 595 void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn, 597 - int severity) 596 + int severity, struct aer_capability_regs *aer_regs) 598 597 { 599 598 unsigned long flags; 600 599 struct aer_recover_entry entry = { ··· 602 601 .devfn = devfn, 603 602 .domain = domain, 604 603 .severity = severity, 604 + .regs = aer_regs, 605 605 }; 606 606 607 607 spin_lock_irqsave(&aer_recover_ring_lock, flags); ··· 629 627 PCI_SLOT(entry.devfn), PCI_FUNC(entry.devfn)); 630 628 continue; 631 629 } 630 + cper_print_aer(pdev, entry.severity, entry.regs); 632 631 do_recovery(pdev, entry.severity); 633 632 pci_dev_put(pdev); 634 633 }
+2 -2
drivers/pci/pcie/aer/aerdrv_errprint.c
··· 220 220 } 221 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 224 struct aer_capability_regs *aer) 225 225 { 226 226 int aer_severity, layer, agent, status_strs_size, tlp_header_valid = 0; ··· 244 244 agent = AER_GET_AGENT(aer_severity, status); 245 245 dev_err(&dev->dev, "aer_status: 0x%08x, aer_mask: 0x%08x\n", 246 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 248 dev_err(&dev->dev, "aer_layer=%s, aer_agent=%s\n", 249 249 aer_error_layer[layer], aer_agent_string[agent]); 250 250 if (aer_severity != AER_CORRECTABLE)
+2 -2
drivers/pinctrl/pinconf.c
··· 610 610 bool found = false; 611 611 unsigned long config; 612 612 613 - mutex_lock(&pctldev->mutex); 613 + mutex_lock(&pinctrl_maps_mutex); 614 614 615 615 /* Parse the pinctrl map and look for the elected pin/state */ 616 616 for_each_maps(maps_node, i, map) { ··· 659 659 confops->pin_config_config_dbg_show(pctldev, s, config); 660 660 661 661 exit: 662 - mutex_unlock(&pctldev->mutex); 662 + mutex_unlock(&pinctrl_maps_mutex); 663 663 664 664 return 0; 665 665 }
+2 -1
drivers/pinctrl/pinctrl-coh901.c
··· 830 830 return 0; 831 831 832 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 835 err_no_chip: 835 836 err_no_domain: 836 837 err_no_port:
+136 -3
drivers/pinctrl/pinctrl-exynos.c
··· 196 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 206 * exynos_eint_gpio_init() - setup handling of external gpio interrupts. 201 207 * @d: driver data of samsung pinctrl driver. ··· 210 204 { 211 205 struct samsung_pin_bank *bank; 212 206 struct device *dev = d->dev; 213 - unsigned int ret; 214 - unsigned int i; 207 + int ret; 208 + int i; 215 209 216 210 if (!d->irq) { 217 211 dev_err(dev, "irq number not available\n"); ··· 233 227 bank->nr_pins, &exynos_gpio_irqd_ops, bank); 234 228 if (!bank->irq_domain) { 235 229 dev_err(dev, "gpio irq domain add failed\n"); 236 - return -ENXIO; 230 + ret = -ENXIO; 231 + goto err_domains; 232 + } 233 + 234 + bank->soc_priv = devm_kzalloc(d->dev, 235 + sizeof(struct exynos_eint_gpio_save), GFP_KERNEL); 236 + if (!bank->soc_priv) { 237 + irq_domain_remove(bank->irq_domain); 238 + ret = -ENOMEM; 239 + goto err_domains; 237 240 } 238 241 } 239 242 240 243 return 0; 244 + 245 + err_domains: 246 + for (--i, --bank; i >= 0; --i, --bank) { 247 + if (bank->eint_type != EINT_TYPE_GPIO) 248 + continue; 249 + irq_domain_remove(bank->irq_domain); 250 + } 251 + 252 + return ret; 241 253 } 242 254 243 255 static void exynos_wkup_irq_unmask(struct irq_data *irqd) ··· 350 326 return 0; 351 327 } 352 328 329 + static u32 exynos_eint_wake_mask = 0xffffffff; 330 + 331 + u32 exynos_get_eint_wake_mask(void) 332 + { 333 + return exynos_eint_wake_mask; 334 + } 335 + 336 + static int exynos_wkup_irq_set_wake(struct irq_data *irqd, unsigned int on) 337 + { 338 + struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd); 339 + unsigned long bit = 1UL << (2 * bank->eint_offset + irqd->hwirq); 340 + 341 + pr_info("wake %s for irq %d\n", on ? "enabled" : "disabled", irqd->irq); 342 + 343 + if (!on) 344 + exynos_eint_wake_mask |= bit; 345 + else 346 + exynos_eint_wake_mask &= ~bit; 347 + 348 + return 0; 349 + } 350 + 353 351 /* 354 352 * irq_chip for wakeup interrupts 355 353 */ ··· 381 335 .irq_mask = exynos_wkup_irq_mask, 382 336 .irq_ack = exynos_wkup_irq_ack, 383 337 .irq_set_type = exynos_wkup_irq_set_type, 338 + .irq_set_wake = exynos_wkup_irq_set_wake, 384 339 }; 385 340 386 341 /* interrupt handler for wakeup interrupts 0..15 */ ··· 552 505 return 0; 553 506 } 554 507 508 + static void exynos_pinctrl_suspend_bank( 509 + struct samsung_pinctrl_drv_data *drvdata, 510 + struct samsung_pin_bank *bank) 511 + { 512 + struct exynos_eint_gpio_save *save = bank->soc_priv; 513 + void __iomem *regs = drvdata->virt_base; 514 + 515 + save->eint_con = readl(regs + EXYNOS_GPIO_ECON_OFFSET 516 + + bank->eint_offset); 517 + save->eint_fltcon0 = readl(regs + EXYNOS_GPIO_EFLTCON_OFFSET 518 + + 2 * bank->eint_offset); 519 + save->eint_fltcon1 = readl(regs + EXYNOS_GPIO_EFLTCON_OFFSET 520 + + 2 * bank->eint_offset + 4); 521 + 522 + pr_debug("%s: save con %#010x\n", bank->name, save->eint_con); 523 + pr_debug("%s: save fltcon0 %#010x\n", bank->name, save->eint_fltcon0); 524 + pr_debug("%s: save fltcon1 %#010x\n", bank->name, save->eint_fltcon1); 525 + } 526 + 527 + static void exynos_pinctrl_suspend(struct samsung_pinctrl_drv_data *drvdata) 528 + { 529 + struct samsung_pin_ctrl *ctrl = drvdata->ctrl; 530 + struct samsung_pin_bank *bank = ctrl->pin_banks; 531 + int i; 532 + 533 + for (i = 0; i < ctrl->nr_banks; ++i, ++bank) 534 + if (bank->eint_type == EINT_TYPE_GPIO) 535 + exynos_pinctrl_suspend_bank(drvdata, bank); 536 + } 537 + 538 + static void exynos_pinctrl_resume_bank( 539 + struct samsung_pinctrl_drv_data *drvdata, 540 + struct samsung_pin_bank *bank) 541 + { 542 + struct exynos_eint_gpio_save *save = bank->soc_priv; 543 + void __iomem *regs = drvdata->virt_base; 544 + 545 + pr_debug("%s: con %#010x => %#010x\n", bank->name, 546 + readl(regs + EXYNOS_GPIO_ECON_OFFSET 547 + + bank->eint_offset), save->eint_con); 548 + pr_debug("%s: fltcon0 %#010x => %#010x\n", bank->name, 549 + readl(regs + EXYNOS_GPIO_EFLTCON_OFFSET 550 + + 2 * bank->eint_offset), save->eint_fltcon0); 551 + pr_debug("%s: fltcon1 %#010x => %#010x\n", bank->name, 552 + readl(regs + EXYNOS_GPIO_EFLTCON_OFFSET 553 + + 2 * bank->eint_offset + 4), save->eint_fltcon1); 554 + 555 + writel(save->eint_con, regs + EXYNOS_GPIO_ECON_OFFSET 556 + + bank->eint_offset); 557 + writel(save->eint_fltcon0, regs + EXYNOS_GPIO_EFLTCON_OFFSET 558 + + 2 * bank->eint_offset); 559 + writel(save->eint_fltcon1, regs + EXYNOS_GPIO_EFLTCON_OFFSET 560 + + 2 * bank->eint_offset + 4); 561 + } 562 + 563 + static void exynos_pinctrl_resume(struct samsung_pinctrl_drv_data *drvdata) 564 + { 565 + struct samsung_pin_ctrl *ctrl = drvdata->ctrl; 566 + struct samsung_pin_bank *bank = ctrl->pin_banks; 567 + int i; 568 + 569 + for (i = 0; i < ctrl->nr_banks; ++i, ++bank) 570 + if (bank->eint_type == EINT_TYPE_GPIO) 571 + exynos_pinctrl_resume_bank(drvdata, bank); 572 + } 573 + 555 574 /* pin banks of exynos4210 pin-controller 0 */ 556 575 static struct samsung_pin_bank exynos4210_pin_banks0[] = { 557 576 EXYNOS_PIN_BANK_EINTG(8, 0x000, "gpa0", 0x00), ··· 681 568 .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, 682 569 .svc = EXYNOS_SVC_OFFSET, 683 570 .eint_gpio_init = exynos_eint_gpio_init, 571 + .suspend = exynos_pinctrl_suspend, 572 + .resume = exynos_pinctrl_resume, 684 573 .label = "exynos4210-gpio-ctrl0", 685 574 }, { 686 575 /* pin-controller instance 1 data */ ··· 697 582 .svc = EXYNOS_SVC_OFFSET, 698 583 .eint_gpio_init = exynos_eint_gpio_init, 699 584 .eint_wkup_init = exynos_eint_wkup_init, 585 + .suspend = exynos_pinctrl_suspend, 586 + .resume = exynos_pinctrl_resume, 700 587 .label = "exynos4210-gpio-ctrl1", 701 588 }, { 702 589 /* pin-controller instance 2 data */ ··· 780 663 .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, 781 664 .svc = EXYNOS_SVC_OFFSET, 782 665 .eint_gpio_init = exynos_eint_gpio_init, 666 + .suspend = exynos_pinctrl_suspend, 667 + .resume = exynos_pinctrl_resume, 783 668 .label = "exynos4x12-gpio-ctrl0", 784 669 }, { 785 670 /* pin-controller instance 1 data */ ··· 796 677 .svc = EXYNOS_SVC_OFFSET, 797 678 .eint_gpio_init = exynos_eint_gpio_init, 798 679 .eint_wkup_init = exynos_eint_wkup_init, 680 + .suspend = exynos_pinctrl_suspend, 681 + .resume = exynos_pinctrl_resume, 799 682 .label = "exynos4x12-gpio-ctrl1", 800 683 }, { 801 684 /* pin-controller instance 2 data */ ··· 808 687 .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, 809 688 .svc = EXYNOS_SVC_OFFSET, 810 689 .eint_gpio_init = exynos_eint_gpio_init, 690 + .suspend = exynos_pinctrl_suspend, 691 + .resume = exynos_pinctrl_resume, 811 692 .label = "exynos4x12-gpio-ctrl2", 812 693 }, { 813 694 /* pin-controller instance 3 data */ ··· 820 697 .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, 821 698 .svc = EXYNOS_SVC_OFFSET, 822 699 .eint_gpio_init = exynos_eint_gpio_init, 700 + .suspend = exynos_pinctrl_suspend, 701 + .resume = exynos_pinctrl_resume, 823 702 .label = "exynos4x12-gpio-ctrl3", 824 703 }, 825 704 }; ··· 900 775 .svc = EXYNOS_SVC_OFFSET, 901 776 .eint_gpio_init = exynos_eint_gpio_init, 902 777 .eint_wkup_init = exynos_eint_wkup_init, 778 + .suspend = exynos_pinctrl_suspend, 779 + .resume = exynos_pinctrl_resume, 903 780 .label = "exynos5250-gpio-ctrl0", 904 781 }, { 905 782 /* pin-controller instance 1 data */ ··· 912 785 .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, 913 786 .svc = EXYNOS_SVC_OFFSET, 914 787 .eint_gpio_init = exynos_eint_gpio_init, 788 + .suspend = exynos_pinctrl_suspend, 789 + .resume = exynos_pinctrl_resume, 915 790 .label = "exynos5250-gpio-ctrl1", 916 791 }, { 917 792 /* pin-controller instance 2 data */ ··· 924 795 .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, 925 796 .svc = EXYNOS_SVC_OFFSET, 926 797 .eint_gpio_init = exynos_eint_gpio_init, 798 + .suspend = exynos_pinctrl_suspend, 799 + .resume = exynos_pinctrl_resume, 927 800 .label = "exynos5250-gpio-ctrl2", 928 801 }, { 929 802 /* pin-controller instance 3 data */ ··· 936 805 .geint_pend = EXYNOS_GPIO_EPEND_OFFSET, 937 806 .svc = EXYNOS_SVC_OFFSET, 938 807 .eint_gpio_init = exynos_eint_gpio_init, 808 + .suspend = exynos_pinctrl_suspend, 809 + .resume = exynos_pinctrl_resume, 939 810 .label = "exynos5250-gpio-ctrl3", 940 811 }, 941 812 };
+1
drivers/pinctrl/pinctrl-exynos.h
··· 19 19 20 20 /* External GPIO and wakeup interrupt related definitions */ 21 21 #define EXYNOS_GPIO_ECON_OFFSET 0x700 22 + #define EXYNOS_GPIO_EFLTCON_OFFSET 0x800 22 23 #define EXYNOS_GPIO_EMASK_OFFSET 0x900 23 24 #define EXYNOS_GPIO_EPEND_OFFSET 0xA00 24 25 #define EXYNOS_WKUP_ECON_OFFSET 0xE00
+154
drivers/pinctrl/pinctrl-samsung.c
··· 28 28 #include <linux/gpio.h> 29 29 #include <linux/irqdomain.h> 30 30 #include <linux/spinlock.h> 31 + #include <linux/syscore_ops.h> 31 32 32 33 #include "core.h" 33 34 #include "pinctrl-samsung.h" ··· 48 47 { "samsung,pin-con-pdn", PINCFG_TYPE_CON_PDN }, 49 48 { "samsung,pin-pud-pdn", PINCFG_TYPE_PUD_PDN }, 50 49 }; 50 + 51 + /* Global list of devices (struct samsung_pinctrl_drv_data) */ 52 + LIST_HEAD(drvdata_list); 51 53 52 54 static unsigned int pin_base; 53 55 ··· 960 956 ctrl->eint_wkup_init(drvdata); 961 957 962 958 platform_set_drvdata(pdev, drvdata); 959 + 960 + /* Add to the global list */ 961 + list_add_tail(&drvdata->node, &drvdata_list); 962 + 963 963 return 0; 964 964 } 965 + 966 + #ifdef CONFIG_PM 967 + 968 + /** 969 + * samsung_pinctrl_suspend_dev - save pinctrl state for suspend for a device 970 + * 971 + * Save data for all banks handled by this device. 972 + */ 973 + static void samsung_pinctrl_suspend_dev( 974 + struct samsung_pinctrl_drv_data *drvdata) 975 + { 976 + struct samsung_pin_ctrl *ctrl = drvdata->ctrl; 977 + void __iomem *virt_base = drvdata->virt_base; 978 + int i; 979 + 980 + for (i = 0; i < ctrl->nr_banks; i++) { 981 + struct samsung_pin_bank *bank = &ctrl->pin_banks[i]; 982 + void __iomem *reg = virt_base + bank->pctl_offset; 983 + 984 + u8 *offs = bank->type->reg_offset; 985 + u8 *widths = bank->type->fld_width; 986 + enum pincfg_type type; 987 + 988 + /* Registers without a powerdown config aren't lost */ 989 + if (!widths[PINCFG_TYPE_CON_PDN]) 990 + continue; 991 + 992 + for (type = 0; type < PINCFG_TYPE_NUM; type++) 993 + if (widths[type]) 994 + bank->pm_save[type] = readl(reg + offs[type]); 995 + 996 + if (widths[PINCFG_TYPE_FUNC] * bank->nr_pins > 32) { 997 + /* Some banks have two config registers */ 998 + bank->pm_save[PINCFG_TYPE_NUM] = 999 + readl(reg + offs[PINCFG_TYPE_FUNC] + 4); 1000 + pr_debug("Save %s @ %p (con %#010x %08x)\n", 1001 + bank->name, reg, 1002 + bank->pm_save[PINCFG_TYPE_FUNC], 1003 + bank->pm_save[PINCFG_TYPE_NUM]); 1004 + } else { 1005 + pr_debug("Save %s @ %p (con %#010x)\n", bank->name, 1006 + reg, bank->pm_save[PINCFG_TYPE_FUNC]); 1007 + } 1008 + } 1009 + 1010 + if (ctrl->suspend) 1011 + ctrl->suspend(drvdata); 1012 + } 1013 + 1014 + /** 1015 + * samsung_pinctrl_resume_dev - restore pinctrl state from suspend for a device 1016 + * 1017 + * Restore one of the banks that was saved during suspend. 1018 + * 1019 + * We don't bother doing anything complicated to avoid glitching lines since 1020 + * we're called before pad retention is turned off. 1021 + */ 1022 + static void samsung_pinctrl_resume_dev(struct samsung_pinctrl_drv_data *drvdata) 1023 + { 1024 + struct samsung_pin_ctrl *ctrl = drvdata->ctrl; 1025 + void __iomem *virt_base = drvdata->virt_base; 1026 + int i; 1027 + 1028 + if (ctrl->resume) 1029 + ctrl->resume(drvdata); 1030 + 1031 + for (i = 0; i < ctrl->nr_banks; i++) { 1032 + struct samsung_pin_bank *bank = &ctrl->pin_banks[i]; 1033 + void __iomem *reg = virt_base + bank->pctl_offset; 1034 + 1035 + u8 *offs = bank->type->reg_offset; 1036 + u8 *widths = bank->type->fld_width; 1037 + enum pincfg_type type; 1038 + 1039 + /* Registers without a powerdown config aren't lost */ 1040 + if (!widths[PINCFG_TYPE_CON_PDN]) 1041 + continue; 1042 + 1043 + if (widths[PINCFG_TYPE_FUNC] * bank->nr_pins > 32) { 1044 + /* Some banks have two config registers */ 1045 + pr_debug("%s @ %p (con %#010x %08x => %#010x %08x)\n", 1046 + bank->name, reg, 1047 + readl(reg + offs[PINCFG_TYPE_FUNC]), 1048 + readl(reg + offs[PINCFG_TYPE_FUNC] + 4), 1049 + bank->pm_save[PINCFG_TYPE_FUNC], 1050 + bank->pm_save[PINCFG_TYPE_NUM]); 1051 + writel(bank->pm_save[PINCFG_TYPE_NUM], 1052 + reg + offs[PINCFG_TYPE_FUNC] + 4); 1053 + } else { 1054 + pr_debug("%s @ %p (con %#010x => %#010x)\n", bank->name, 1055 + reg, readl(reg + offs[PINCFG_TYPE_FUNC]), 1056 + bank->pm_save[PINCFG_TYPE_FUNC]); 1057 + } 1058 + for (type = 0; type < PINCFG_TYPE_NUM; type++) 1059 + if (widths[type]) 1060 + writel(bank->pm_save[type], reg + offs[type]); 1061 + } 1062 + } 1063 + 1064 + /** 1065 + * samsung_pinctrl_suspend - save pinctrl state for suspend 1066 + * 1067 + * Save data for all banks across all devices. 1068 + */ 1069 + static int samsung_pinctrl_suspend(void) 1070 + { 1071 + struct samsung_pinctrl_drv_data *drvdata; 1072 + 1073 + list_for_each_entry(drvdata, &drvdata_list, node) { 1074 + samsung_pinctrl_suspend_dev(drvdata); 1075 + } 1076 + 1077 + return 0; 1078 + } 1079 + 1080 + /** 1081 + * samsung_pinctrl_resume - restore pinctrl state for suspend 1082 + * 1083 + * Restore data for all banks across all devices. 1084 + */ 1085 + static void samsung_pinctrl_resume(void) 1086 + { 1087 + struct samsung_pinctrl_drv_data *drvdata; 1088 + 1089 + list_for_each_entry_reverse(drvdata, &drvdata_list, node) { 1090 + samsung_pinctrl_resume_dev(drvdata); 1091 + } 1092 + } 1093 + 1094 + #else 1095 + #define samsung_pinctrl_suspend NULL 1096 + #define samsung_pinctrl_resume NULL 1097 + #endif 1098 + 1099 + static struct syscore_ops samsung_pinctrl_syscore_ops = { 1100 + .suspend = samsung_pinctrl_suspend, 1101 + .resume = samsung_pinctrl_resume, 1102 + }; 965 1103 966 1104 static const struct of_device_id samsung_pinctrl_dt_match[] = { 967 1105 #ifdef CONFIG_PINCTRL_EXYNOS ··· 1133 987 1134 988 static int __init samsung_pinctrl_drv_register(void) 1135 989 { 990 + /* 991 + * Register syscore ops for save/restore of registers across suspend. 992 + * It's important to ensure that this driver is running at an earlier 993 + * initcall level than any arch-specific init calls that install syscore 994 + * ops that turn off pad retention (like exynos_pm_resume). 995 + */ 996 + register_syscore_ops(&samsung_pinctrl_syscore_ops); 997 + 1136 998 return platform_driver_register(&samsung_pinctrl_driver); 1137 999 } 1138 1000 postcore_initcall(samsung_pinctrl_drv_register);
+9
drivers/pinctrl/pinctrl-samsung.h
··· 127 127 * @gpio_chip: GPIO chip of the bank. 128 128 * @grange: linux gpio pin range supported by this bank. 129 129 * @slock: spinlock protecting bank registers 130 + * @pm_save: saved register values during suspend 130 131 */ 131 132 struct samsung_pin_bank { 132 133 struct samsung_pin_bank_type *type; ··· 139 138 u32 eint_mask; 140 139 u32 eint_offset; 141 140 char *name; 141 + void *soc_priv; 142 142 struct device_node *of_node; 143 143 struct samsung_pinctrl_drv_data *drvdata; 144 144 struct irq_domain *irq_domain; 145 145 struct gpio_chip gpio_chip; 146 146 struct pinctrl_gpio_range grange; 147 147 spinlock_t slock; 148 + 149 + u32 pm_save[PINCFG_TYPE_NUM + 1]; /* +1 to handle double CON registers*/ 148 150 }; 149 151 150 152 /** ··· 188 184 189 185 int (*eint_gpio_init)(struct samsung_pinctrl_drv_data *); 190 186 int (*eint_wkup_init)(struct samsung_pinctrl_drv_data *); 187 + void (*suspend)(struct samsung_pinctrl_drv_data *); 188 + void (*resume)(struct samsung_pinctrl_drv_data *); 189 + 191 190 char *label; 192 191 }; 193 192 194 193 /** 195 194 * struct samsung_pinctrl_drv_data: wrapper for holding driver data together. 195 + * @node: global list node 196 196 * @virt_base: register base address of the controller. 197 197 * @dev: device instance representing the controller. 198 198 * @irq: interrpt number used by the controller to notify gpio interrupts. ··· 209 201 * @nr_function: number of such pin functions. 210 202 */ 211 203 struct samsung_pinctrl_drv_data { 204 + struct list_head node; 212 205 void __iomem *virt_base; 213 206 struct device *dev; 214 207 int irq;
+5 -2
drivers/pinctrl/pinctrl-sunxi.c
··· 1990 1990 } 1991 1991 1992 1992 clk = devm_clk_get(&pdev->dev, NULL); 1993 - if (IS_ERR(clk)) 1993 + if (IS_ERR(clk)) { 1994 + ret = PTR_ERR(clk); 1994 1995 goto gpiochip_error; 1996 + } 1995 1997 1996 1998 clk_prepare_enable(clk); 1997 1999 ··· 2002 2000 return 0; 2003 2001 2004 2002 gpiochip_error: 2005 - ret = gpiochip_remove(pctl->chip); 2003 + if (gpiochip_remove(pctl->chip)) 2004 + dev_err(&pdev->dev, "failed to remove gpio chip\n"); 2006 2005 pinctrl_error: 2007 2006 pinctrl_unregister(pctl->pctl_dev); 2008 2007 return ret;
+1 -2
drivers/pinctrl/vt8500/pinctrl-wmt.c
··· 609 609 return 0; 610 610 611 611 fail_range: 612 - err = gpiochip_remove(&data->gpio_chip); 613 - if (err) 612 + if (gpiochip_remove(&data->gpio_chip)) 614 613 dev_err(&pdev->dev, "failed to remove gpio chip\n"); 615 614 fail_gpio: 616 615 pinctrl_unregister(data->pctl_dev);
+1 -1
drivers/scsi/qla2xxx/tcm_qla2xxx.c
··· 1370 1370 dump_stack(); 1371 1371 return; 1372 1372 } 1373 - target_wait_for_sess_cmds(se_sess, 0); 1373 + target_wait_for_sess_cmds(se_sess); 1374 1374 1375 1375 transport_deregister_session_configfs(sess->se_sess); 1376 1376 transport_deregister_session(sess->se_sess);
+1
drivers/scsi/scsi_proc.c
··· 84 84 85 85 static const struct file_operations proc_scsi_fops = { 86 86 .open = proc_scsi_host_open, 87 + .release = single_release, 87 88 .read = seq_read, 88 89 .llseek = seq_lseek, 89 90 .write = proc_scsi_host_write
+2 -19
drivers/staging/imx-drm/ipuv3-crtc.c
··· 316 316 317 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 319 unsigned long flags; 322 320 struct drm_device *drm = ipu_crtc->base.dev; 323 321 324 322 spin_lock_irqsave(&drm->event_lock, flags); 325 - 326 - e = 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; 323 + if (ipu_crtc->page_flip_event) 324 + drm_send_vblank_event(drm, -1, ipu_crtc->page_flip_event); 336 325 ipu_crtc->page_flip_event = NULL; 337 - 338 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 327 spin_unlock_irqrestore(&drm->event_lock, flags); 345 328 } 346 329
+6 -6
drivers/target/iscsi/iscsi_target.c
··· 651 651 cmd->buf_ptr = kmemdup(buf, ISCSI_HDR_LEN, GFP_KERNEL); 652 652 if (!cmd->buf_ptr) { 653 653 pr_err("Unable to allocate memory for cmd->buf_ptr\n"); 654 - iscsit_release_cmd(cmd); 654 + iscsit_free_cmd(cmd, false); 655 655 return -1; 656 656 } 657 657 ··· 697 697 cmd->buf_ptr = kmemdup(buf, ISCSI_HDR_LEN, GFP_KERNEL); 698 698 if (!cmd->buf_ptr) { 699 699 pr_err("Unable to allocate memory for cmd->buf_ptr\n"); 700 - iscsit_release_cmd(cmd); 700 + iscsit_free_cmd(cmd, false); 701 701 return -1; 702 702 } 703 703 ··· 1743 1743 return 0; 1744 1744 out: 1745 1745 if (cmd) 1746 - iscsit_release_cmd(cmd); 1746 + iscsit_free_cmd(cmd, false); 1747 1747 ping_out: 1748 1748 kfree(ping_data); 1749 1749 return ret; ··· 2251 2251 if (conn->conn_state != TARG_CONN_STATE_LOGGED_IN) { 2252 2252 pr_err("Received logout request on connection that" 2253 2253 " is not in logged in state, ignoring request.\n"); 2254 - iscsit_release_cmd(cmd); 2254 + iscsit_free_cmd(cmd, false); 2255 2255 return 0; 2256 2256 } 2257 2257 ··· 3665 3665 list_del(&cmd->i_conn_node); 3666 3666 spin_unlock_bh(&conn->cmd_lock); 3667 3667 3668 - iscsit_free_cmd(cmd); 3668 + iscsit_free_cmd(cmd, false); 3669 3669 break; 3670 3670 case ISTATE_SEND_NOPIN_WANT_RESPONSE: 3671 3671 iscsit_mod_nopin_response_timer(conn); ··· 4122 4122 4123 4123 iscsit_increment_maxcmdsn(cmd, sess); 4124 4124 4125 - iscsit_free_cmd(cmd); 4125 + iscsit_free_cmd(cmd, true); 4126 4126 4127 4127 spin_lock_bh(&conn->cmd_lock); 4128 4128 }
+6 -6
drivers/target/iscsi/iscsi_target_erl2.c
··· 143 143 list_del(&cmd->i_conn_node); 144 144 cmd->conn = NULL; 145 145 spin_unlock(&cr->conn_recovery_cmd_lock); 146 - iscsit_free_cmd(cmd); 146 + iscsit_free_cmd(cmd, true); 147 147 spin_lock(&cr->conn_recovery_cmd_lock); 148 148 } 149 149 spin_unlock(&cr->conn_recovery_cmd_lock); ··· 165 165 list_del(&cmd->i_conn_node); 166 166 cmd->conn = NULL; 167 167 spin_unlock(&cr->conn_recovery_cmd_lock); 168 - iscsit_free_cmd(cmd); 168 + iscsit_free_cmd(cmd, true); 169 169 spin_lock(&cr->conn_recovery_cmd_lock); 170 170 } 171 171 spin_unlock(&cr->conn_recovery_cmd_lock); ··· 248 248 iscsit_remove_cmd_from_connection_recovery(cmd, sess); 249 249 250 250 spin_unlock(&cr->conn_recovery_cmd_lock); 251 - iscsit_free_cmd(cmd); 251 + iscsit_free_cmd(cmd, true); 252 252 spin_lock(&cr->conn_recovery_cmd_lock); 253 253 } 254 254 spin_unlock(&cr->conn_recovery_cmd_lock); ··· 302 302 list_del(&cmd->i_conn_node); 303 303 304 304 spin_unlock_bh(&conn->cmd_lock); 305 - iscsit_free_cmd(cmd); 305 + iscsit_free_cmd(cmd, true); 306 306 spin_lock_bh(&conn->cmd_lock); 307 307 } 308 308 spin_unlock_bh(&conn->cmd_lock); ··· 355 355 356 356 list_del(&cmd->i_conn_node); 357 357 spin_unlock_bh(&conn->cmd_lock); 358 - iscsit_free_cmd(cmd); 358 + iscsit_free_cmd(cmd, true); 359 359 spin_lock_bh(&conn->cmd_lock); 360 360 continue; 361 361 } ··· 375 375 iscsi_sna_gte(cmd->cmd_sn, conn->sess->exp_cmd_sn)) { 376 376 list_del(&cmd->i_conn_node); 377 377 spin_unlock_bh(&conn->cmd_lock); 378 - iscsit_free_cmd(cmd); 378 + iscsit_free_cmd(cmd, true); 379 379 spin_lock_bh(&conn->cmd_lock); 380 380 continue; 381 381 }
+3 -5
drivers/target/iscsi/iscsi_target_parameters.c
··· 758 758 } 759 759 INIT_LIST_HEAD(&extra_response->er_list); 760 760 761 - strncpy(extra_response->key, key, strlen(key) + 1); 762 - strncpy(extra_response->value, NOTUNDERSTOOD, 763 - strlen(NOTUNDERSTOOD) + 1); 761 + strlcpy(extra_response->key, key, sizeof(extra_response->key)); 762 + strlcpy(extra_response->value, NOTUNDERSTOOD, 763 + sizeof(extra_response->value)); 764 764 765 765 list_add_tail(&extra_response->er_list, 766 766 &param_list->extra_response_list); ··· 1629 1629 1630 1630 if (phase & PHASE_SECURITY) { 1631 1631 if (iscsi_check_for_auth_key(key) > 0) { 1632 - char *tmpptr = key + strlen(key); 1633 - *tmpptr = '='; 1634 1632 kfree(tmpbuf); 1635 1633 return 1; 1636 1634 }
+3 -1
drivers/target/iscsi/iscsi_target_parameters.h
··· 1 1 #ifndef ISCSI_PARAMETERS_H 2 2 #define ISCSI_PARAMETERS_H 3 3 4 + #include <scsi/iscsi_proto.h> 5 + 4 6 struct iscsi_extra_response { 5 - char key[64]; 7 + char key[KEY_MAXLEN]; 6 8 char value[32]; 7 9 struct list_head er_list; 8 10 } ____cacheline_aligned;
+39 -15
drivers/target/iscsi/iscsi_target_util.c
··· 676 676 677 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 679 kfree(cmd->buf_ptr); 685 680 kfree(cmd->pdu_list); 686 681 kfree(cmd->seq_list); 687 682 kfree(cmd->tmr_req); 688 683 kfree(cmd->iov_data); 689 684 690 - if (conn) { 691 - iscsit_remove_cmd_from_immediate_queue(cmd, conn); 692 - iscsit_remove_cmd_from_response_queue(cmd, conn); 693 - } 694 - 695 685 kmem_cache_free(lio_cmd_cache, cmd); 696 686 } 697 687 698 - void iscsit_free_cmd(struct iscsi_cmd *cmd) 688 + static void __iscsit_free_cmd(struct iscsi_cmd *cmd, bool scsi_cmd, 689 + bool check_queues) 699 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) { 703 + iscsit_remove_cmd_from_immediate_queue(cmd, conn); 704 + iscsit_remove_cmd_from_response_queue(cmd, conn); 705 + } 706 + } 707 + 708 + void iscsit_free_cmd(struct iscsi_cmd *cmd, bool shutdown) 709 + { 710 + struct se_cmd *se_cmd = NULL; 711 + int rc; 700 712 /* 701 713 * Determine if a struct se_cmd is associated with 702 714 * this struct iscsi_cmd. 703 715 */ 704 716 switch (cmd->iscsi_opcode) { 705 717 case ISCSI_OP_SCSI_CMD: 706 - if (cmd->data_direction == DMA_TO_DEVICE) 707 - iscsit_stop_dataout_timer(cmd); 718 + se_cmd = &cmd->se_cmd; 719 + __iscsit_free_cmd(cmd, true, shutdown); 708 720 /* 709 721 * Fallthrough 710 722 */ 711 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 729 break; 714 730 case ISCSI_OP_REJECT: 715 731 /* ··· 734 718 * associated cmd->se_cmd needs to be released. 735 719 */ 736 720 if (cmd->se_cmd.se_tfo != NULL) { 737 - transport_generic_free_cmd(&cmd->se_cmd, 1); 721 + se_cmd = &cmd->se_cmd; 722 + __iscsit_free_cmd(cmd, true, shutdown); 723 + 724 + rc = transport_generic_free_cmd(&cmd->se_cmd, 1); 725 + if (!rc && shutdown && se_cmd->se_sess) { 726 + __iscsit_free_cmd(cmd, true, shutdown); 727 + target_put_sess_cmd(se_cmd->se_sess, se_cmd); 728 + } 738 729 break; 739 730 } 740 731 /* Fall-through */ 741 732 default: 733 + __iscsit_free_cmd(cmd, false, shutdown); 742 734 cmd->release_cmd(cmd); 743 735 break; 744 736 }
+1 -1
drivers/target/iscsi/iscsi_target_util.h
··· 29 29 extern bool iscsit_conn_all_queues_empty(struct iscsi_conn *); 30 30 extern void iscsit_free_queue_reqs_for_conn(struct iscsi_conn *); 31 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 33 extern int iscsit_check_session_usage_count(struct iscsi_session *); 34 34 extern void iscsit_dec_session_usage_count(struct iscsi_session *); 35 35 extern void iscsit_inc_session_usage_count(struct iscsi_session *);
+6 -5
drivers/target/target_core_file.c
··· 153 153 struct request_queue *q = bdev_get_queue(inode->i_bdev); 154 154 unsigned long long dev_size; 155 155 156 + fd_dev->fd_block_size = bdev_logical_block_size(inode->i_bdev); 156 157 /* 157 158 * Determine the number of bytes from i_size_read() minus 158 159 * one (1) logical sector from underlying struct block_device ··· 200 199 goto fail; 201 200 } 202 201 202 + fd_dev->fd_block_size = FD_BLOCKSIZE; 203 203 /* 204 204 * Limit UNMAP emulation to 8k Number of LBAs (NoLB) 205 205 */ ··· 219 217 dev->dev_attrib.max_write_same_len = 0x1000; 220 218 } 221 219 222 - fd_dev->fd_block_size = dev->dev_attrib.hw_block_size; 223 - 224 - dev->dev_attrib.hw_block_size = FD_BLOCKSIZE; 220 + dev->dev_attrib.hw_block_size = fd_dev->fd_block_size; 225 221 dev->dev_attrib.hw_max_sectors = FD_MAX_SECTORS; 226 222 dev->dev_attrib.hw_queue_depth = FD_MAX_DEVICE_QUEUE_DEPTH; 227 223 ··· 694 694 * to handle underlying block_device resize operations. 695 695 */ 696 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 698 else 699 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 705 static struct sbc_ops fd_sbc_ops = {
+34 -40
drivers/target/target_core_transport.c
··· 65 65 static void transport_handle_queue_full(struct se_cmd *cmd, 66 66 struct se_device *dev); 67 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 69 static void target_complete_ok_work(struct work_struct *work); 70 70 71 71 int init_se_kmem_caches(void) ··· 221 221 INIT_LIST_HEAD(&se_sess->sess_list); 222 222 INIT_LIST_HEAD(&se_sess->sess_acl_list); 223 223 INIT_LIST_HEAD(&se_sess->sess_cmd_list); 224 + INIT_LIST_HEAD(&se_sess->sess_wait_list); 224 225 spin_lock_init(&se_sess->sess_cmd_lock); 225 226 kref_init(&se_sess->sess_kref); 226 227 ··· 1944 1943 * This routine unconditionally frees a command, and reference counting 1945 1944 * or list removal must be done in the caller. 1946 1945 */ 1947 - static void transport_release_cmd(struct se_cmd *cmd) 1946 + static int transport_release_cmd(struct se_cmd *cmd) 1948 1947 { 1949 1948 BUG_ON(!cmd->se_tfo); 1950 1949 ··· 1956 1955 * If this cmd has been setup with target_get_sess_cmd(), drop 1957 1956 * the kref and call ->release_cmd() in kref callback. 1958 1957 */ 1959 - if (cmd->check_release != 0) { 1960 - target_put_sess_cmd(cmd->se_sess, cmd); 1961 - return; 1962 - } 1958 + if (cmd->check_release != 0) 1959 + return target_put_sess_cmd(cmd->se_sess, cmd); 1960 + 1963 1961 cmd->se_tfo->release_cmd(cmd); 1962 + return 1; 1964 1963 } 1965 1964 1966 1965 /** ··· 1969 1968 * 1970 1969 * This routine releases our reference to the command and frees it if possible. 1971 1970 */ 1972 - static void transport_put_cmd(struct se_cmd *cmd) 1971 + static int transport_put_cmd(struct se_cmd *cmd) 1973 1972 { 1974 1973 unsigned long flags; 1975 1974 ··· 1977 1976 if (atomic_read(&cmd->t_fe_count) && 1978 1977 !atomic_dec_and_test(&cmd->t_fe_count)) { 1979 1978 spin_unlock_irqrestore(&cmd->t_state_lock, flags); 1980 - return; 1979 + return 0; 1981 1980 } 1982 1981 1983 1982 if (cmd->transport_state & CMD_T_DEV_ACTIVE) { ··· 1987 1986 spin_unlock_irqrestore(&cmd->t_state_lock, flags); 1988 1987 1989 1988 transport_free_pages(cmd); 1990 - transport_release_cmd(cmd); 1991 - return; 1989 + return transport_release_cmd(cmd); 1992 1990 } 1993 1991 1994 1992 void *transport_kmap_data_sg(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 2159 if (!(cmd->se_cmd_flags & SCF_SE_LUN_CMD)) { 2158 2160 if (wait_for_tasks && (cmd->se_cmd_flags & SCF_SCSI_TMR_CDB)) 2159 2161 transport_wait_for_tasks(cmd); 2160 2162 2161 - transport_release_cmd(cmd); 2163 + ret = transport_release_cmd(cmd); 2162 2164 } else { 2163 2165 if (wait_for_tasks) 2164 2166 transport_wait_for_tasks(cmd); ··· 2168 2166 if (cmd->se_lun) 2169 2167 transport_lun_remove_cmd(cmd); 2170 2168 2171 - transport_put_cmd(cmd); 2169 + ret = transport_put_cmd(cmd); 2172 2170 } 2171 + return ret; 2173 2172 } 2174 2173 EXPORT_SYMBOL(transport_generic_free_cmd); 2175 2174 ··· 2253 2250 unsigned long flags; 2254 2251 2255 2252 spin_lock_irqsave(&se_sess->sess_cmd_lock, flags); 2256 - 2257 - WARN_ON(se_sess->sess_tearing_down); 2253 + if (se_sess->sess_tearing_down) { 2254 + spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags); 2255 + return; 2256 + } 2258 2257 se_sess->sess_tearing_down = 1; 2258 + list_splice_init(&se_sess->sess_cmd_list, &se_sess->sess_wait_list); 2259 2259 2260 - list_for_each_entry(se_cmd, &se_sess->sess_cmd_list, se_cmd_list) 2260 + list_for_each_entry(se_cmd, &se_sess->sess_wait_list, se_cmd_list) 2261 2261 se_cmd->cmd_wait_set = 1; 2262 2262 2263 2263 spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags); ··· 2269 2263 2270 2264 /* target_wait_for_sess_cmds - Wait for outstanding descriptors 2271 2265 * @se_sess: session to wait for active I/O 2272 - * @wait_for_tasks: Make extra transport_wait_for_tasks call 2273 2266 */ 2274 - void target_wait_for_sess_cmds( 2275 - struct se_session *se_sess, 2276 - int wait_for_tasks) 2267 + void target_wait_for_sess_cmds(struct se_session *se_sess) 2277 2268 { 2278 2269 struct se_cmd *se_cmd, *tmp_cmd; 2279 - bool rc = false; 2270 + unsigned long flags; 2280 2271 2281 2272 list_for_each_entry_safe(se_cmd, tmp_cmd, 2282 - &se_sess->sess_cmd_list, se_cmd_list) { 2273 + &se_sess->sess_wait_list, se_cmd_list) { 2283 2274 list_del(&se_cmd->se_cmd_list); 2284 2275 2285 2276 pr_debug("Waiting for se_cmd: %p t_state: %d, fabric state:" 2286 2277 " %d\n", se_cmd, se_cmd->t_state, 2287 2278 se_cmd->se_tfo->get_cmd_state(se_cmd)); 2288 2279 2289 - if (wait_for_tasks) { 2290 - pr_debug("Calling 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 - rc = transport_wait_for_tasks(se_cmd); 2295 - 2296 - pr_debug("After transport_wait_for_tasks se_cmd: %p t_state: %d," 2297 - " fabric state: %d\n", se_cmd, se_cmd->t_state, 2298 - se_cmd->se_tfo->get_cmd_state(se_cmd)); 2299 - } 2300 - 2301 - if (!rc) { 2302 - wait_for_completion(&se_cmd->cmd_wait_comp); 2303 - pr_debug("After cmd_wait_comp: se_cmd: %p t_state: %d" 2304 - " fabric state: %d\n", se_cmd, se_cmd->t_state, 2305 - se_cmd->se_tfo->get_cmd_state(se_cmd)); 2306 - } 2280 + wait_for_completion(&se_cmd->cmd_wait_comp); 2281 + pr_debug("After cmd_wait_comp: se_cmd: %p t_state: %d" 2282 + " fabric state: %d\n", se_cmd, se_cmd->t_state, 2283 + se_cmd->se_tfo->get_cmd_state(se_cmd)); 2307 2284 2308 2285 se_cmd->se_tfo->release_cmd(se_cmd); 2309 2286 } 2287 + 2288 + spin_lock_irqsave(&se_sess->sess_cmd_lock, flags); 2289 + WARN_ON(!list_empty(&se_sess->sess_cmd_list)); 2290 + spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags); 2291 + 2310 2292 } 2311 2293 EXPORT_SYMBOL(target_wait_for_sess_cmds); 2312 2294
+12 -3
drivers/video/atmel_lcdfb.c
··· 223 223 224 224 static void exit_backlight(struct atmel_lcdfb_info *sinfo) 225 225 { 226 - if (sinfo->backlight) 227 - backlight_device_unregister(sinfo->backlight); 226 + if (!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 236 #else ··· 467 461 if (info->fix.smem_len) { 468 462 unsigned int smem_len = (var->xres_virtual * var->yres_virtual 469 463 * ((var->bits_per_pixel + 7) / 8)); 470 - if (smem_len > info->fix.smem_len) 464 + if (smem_len > info->fix.smem_len) { 465 + dev_err(dev, "Frame buffer is too small (%u) for screen size (need at least %u)\n", 466 + info->fix.smem_len, smem_len); 471 467 return -EINVAL; 468 + } 472 469 } 473 470 474 471 /* Saturate vertical and horizontal timings at maximum values */
+19 -1
drivers/video/omap2/dss/core.c
··· 53 53 module_param_named(def_disp, def_disp_name, charp, 0); 54 54 MODULE_PARM_DESC(def_disp, "default display name"); 55 55 56 + static bool dss_initialized; 57 + 56 58 const char *omapdss_get_default_display_name(void) 57 59 { 58 60 return core.default_display_name; ··· 67 65 return pdata->version; 68 66 } 69 67 EXPORT_SYMBOL(omapdss_get_version); 68 + 69 + bool omapdss_is_initialized(void) 70 + { 71 + return dss_initialized; 72 + } 73 + EXPORT_SYMBOL(omapdss_is_initialized); 70 74 71 75 struct platform_device *dss_get_core_pdev(void) 72 76 { ··· 611 603 return r; 612 604 } 613 605 606 + dss_initialized = true; 607 + 614 608 return 0; 615 609 } 616 610 ··· 643 633 644 634 static int __init omap_dss_init2(void) 645 635 { 646 - return omap_dss_register_drivers(); 636 + int r; 637 + 638 + r = omap_dss_register_drivers(); 639 + if (r) 640 + return r; 641 + 642 + dss_initialized = true; 643 + 644 + return 0; 647 645 } 648 646 649 647 core_initcall(omap_dss_init);
+3
drivers/video/omap2/omapfb/omapfb-main.c
··· 2416 2416 2417 2417 DBG("omapfb_probe\n"); 2418 2418 2419 + if (omapdss_is_initialized() == false) 2420 + return -EPROBE_DEFER; 2421 + 2419 2422 if (pdev->num_resources != 0) { 2420 2423 dev_err(&pdev->dev, "probed for an unknown device\n"); 2421 2424 r = -ENODEV;
+1 -1
drivers/video/ps3fb.c
··· 710 710 r = vm_iomap_memory(vma, info->fix.smem_start, info->fix.smem_len); 711 711 712 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 714 vma->vm_start); 715 715 716 716 return r;
+2
drivers/xen/tmem.c
··· 41 41 #ifdef CONFIG_FRONTSWAP 42 42 static bool frontswap __read_mostly = true; 43 43 module_param(frontswap, bool, S_IRUGO); 44 + #else /* CONFIG_FRONTSWAP */ 45 + #define frontswap (0) 44 46 #endif /* CONFIG_FRONTSWAP */ 45 47 46 48 #ifdef CONFIG_XEN_SELFBALLOONING
+2 -2
drivers/xen/xen-pciback/pci_stub.c
··· 106 106 else 107 107 pci_restore_state(dev); 108 108 109 - if (pci_find_capability(dev, PCI_CAP_ID_MSIX)) { 109 + if (dev->msix_cap) { 110 110 struct physdev_pci_device ppdev = { 111 111 .seg = pci_domain_nr(dev->bus), 112 112 .bus = dev->bus->number, ··· 371 371 if (err) 372 372 goto config_release; 373 373 374 - if (pci_find_capability(dev, PCI_CAP_ID_MSIX)) { 374 + if (dev->msix_cap) { 375 375 struct physdev_pci_device ppdev = { 376 376 .seg = pci_domain_nr(dev->bus), 377 377 .bus = dev->bus->number,
+3 -2
drivers/xen/xenbus/xenbus_client.c
··· 534 534 535 535 err = xenbus_map_ring(dev, gnt_ref, &node->handle, addr); 536 536 if (err) 537 - goto out_err; 537 + goto out_err_free_ballooned_pages; 538 538 539 539 spin_lock(&xenbus_valloc_lock); 540 540 list_add(&node->next, &xenbus_valloc_pages); ··· 543 543 *vaddr = addr; 544 544 return 0; 545 545 546 - out_err: 546 + out_err_free_ballooned_pages: 547 547 free_xenballooned_pages(1, &node->page); 548 + out_err: 548 549 kfree(node); 549 550 return err; 550 551 }
+1
drivers/xen/xenbus/xenbus_comms.h
··· 45 45 int xs_input_avail(void); 46 46 extern struct xenstore_domain_interface *xen_store_interface; 47 47 extern int xen_store_evtchn; 48 + extern enum xenstore_init xen_store_domain_type; 48 49 49 50 extern const struct file_operations xen_xenbus_fops; 50 51
+12 -15
drivers/xen/xenbus/xenbus_probe.c
··· 69 69 struct xenstore_domain_interface *xen_store_interface; 70 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 75 static unsigned long xen_store_mfn; 73 76 74 77 static BLOCKING_NOTIFIER_HEAD(xenstore_chain); ··· 722 719 return err; 723 720 } 724 721 725 - enum xenstore_init { 726 - UNKNOWN, 727 - PV, 728 - HVM, 729 - LOCAL, 730 - }; 731 722 static int __init xenbus_init(void) 732 723 { 733 724 int err = 0; 734 - enum xenstore_init usage = UNKNOWN; 735 725 uint64_t v = 0; 726 + xen_store_domain_type = XS_UNKNOWN; 736 727 737 728 if (!xen_domain()) 738 729 return -ENODEV; ··· 734 737 xenbus_ring_ops_init(); 735 738 736 739 if (xen_pv_domain()) 737 - usage = PV; 740 + xen_store_domain_type = XS_PV; 738 741 if (xen_hvm_domain()) 739 - usage = HVM; 742 + xen_store_domain_type = XS_HVM; 740 743 if (xen_hvm_domain() && xen_initial_domain()) 741 - usage = LOCAL; 744 + xen_store_domain_type = XS_LOCAL; 742 745 if (xen_pv_domain() && !xen_start_info->store_evtchn) 743 - usage = LOCAL; 746 + xen_store_domain_type = XS_LOCAL; 744 747 if (xen_pv_domain() && xen_start_info->store_evtchn) 745 748 xenstored_ready = 1; 746 749 747 - switch (usage) { 748 - case LOCAL: 750 + switch (xen_store_domain_type) { 751 + case XS_LOCAL: 749 752 err = xenstored_local_init(); 750 753 if (err) 751 754 goto out_error; 752 755 xen_store_interface = mfn_to_virt(xen_store_mfn); 753 756 break; 754 - case PV: 757 + case XS_PV: 755 758 xen_store_evtchn = xen_start_info->store_evtchn; 756 759 xen_store_mfn = xen_start_info->store_mfn; 757 760 xen_store_interface = mfn_to_virt(xen_store_mfn); 758 761 break; 759 - case HVM: 762 + case XS_HVM: 760 763 err = hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &v); 761 764 if (err) 762 765 goto out_error;
+7
drivers/xen/xenbus/xenbus_probe.h
··· 47 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 57 extern struct device_attribute xenbus_dev_attrs[]; 51 58 52 59 extern int xenbus_match(struct device *_dev, struct device_driver *_drv);
+36 -1
drivers/xen/xenbus/xenbus_probe_frontend.c
··· 29 29 #include "xenbus_probe.h" 30 30 31 31 32 + static struct workqueue_struct *xenbus_frontend_wq; 33 + 32 34 /* device/<type>/<id> => <type>-<id> */ 33 35 static int frontend_bus_id(char bus_id[XEN_BUS_ID_SIZE], const char *nodename) 34 36 { ··· 91 89 xenbus_otherend_changed(watch, vec, len, 1); 92 90 } 93 91 92 + static void xenbus_frontend_delayed_resume(struct work_struct *w) 93 + { 94 + struct xenbus_device *xdev = container_of(w, struct xenbus_device, work); 95 + 96 + xenbus_dev_resume(&xdev->dev); 97 + } 98 + 99 + static int xenbus_frontend_dev_resume(struct device *dev) 100 + { 101 + /* 102 + * If xenstored is running in this domain, we cannot access the backend 103 + * state at the moment, so we need to defer xenbus_dev_resume 104 + */ 105 + if (xen_store_domain_type == XS_LOCAL) { 106 + struct xenbus_device *xdev = to_xenbus_device(dev); 107 + 108 + if (!xenbus_frontend_wq) { 109 + pr_err("%s: no workqueue to process delayed resume\n", 110 + xdev->nodename); 111 + return -EFAULT; 112 + } 113 + 114 + INIT_WORK(&xdev->work, xenbus_frontend_delayed_resume); 115 + queue_work(xenbus_frontend_wq, &xdev->work); 116 + 117 + return 0; 118 + } 119 + 120 + return xenbus_dev_resume(dev); 121 + } 122 + 94 123 static const struct dev_pm_ops xenbus_pm_ops = { 95 124 .suspend = xenbus_dev_suspend, 96 - .resume = xenbus_dev_resume, 125 + .resume = xenbus_frontend_dev_resume, 97 126 .freeze = xenbus_dev_suspend, 98 127 .thaw = xenbus_dev_cancel, 99 128 .restore = xenbus_dev_resume, ··· 472 439 return err; 473 440 474 441 register_xenstore_notifier(&xenstore_notifier); 442 + 443 + xenbus_frontend_wq = create_workqueue("xenbus_frontend"); 475 444 476 445 return 0; 477 446 }
+2 -2
fs/befs/linuxvfs.c
··· 265 265 result = filldir(dirent, keybuf, keysize, filp->f_pos, 266 266 (ino_t) value, d_type); 267 267 } 268 - 269 - filp->f_pos++; 268 + if (!result) 269 + filp->f_pos++; 270 270 271 271 befs_debug(sb, "<--- befs_readdir() filp->f_pos %Ld", filp->f_pos); 272 272
+72 -69
fs/cifs/cifs_dfs_ref.c
··· 18 18 #include <linux/slab.h> 19 19 #include <linux/vfs.h> 20 20 #include <linux/fs.h> 21 + #include <linux/inet.h> 21 22 #include "cifsglob.h" 22 23 #include "cifsproto.h" 23 24 #include "cifsfs.h" ··· 49 48 } 50 49 51 50 /** 52 - * cifs_get_share_name - extracts share name from UNC 53 - * @node_name: pointer to UNC string 51 + * cifs_build_devname - build a devicename from a UNC and optional prepath 52 + * @nodename: pointer to UNC string 53 + * @prepath: pointer to prefixpath (or NULL if there isn't one) 54 54 * 55 - * Extracts sharename form full UNC. 56 - * i.e. strips from UNC trailing path that is not part of share 57 - * name and fixup missing '\' in the beginning of DFS node refferal 58 - * if necessary. 59 - * Returns pointer to share name on success or ERR_PTR on error. 60 - * Caller is responsible for freeing returned string. 55 + * Build a new cifs devicename after chasing a DFS referral. Allocate a buffer 56 + * big enough to hold the final thing. Copy the UNC from the nodename, and 57 + * concatenate the prepath onto the end of it if there is one. 58 + * 59 + * Returns pointer to the built string, or a ERR_PTR. Caller is responsible 60 + * for freeing the returned string. 61 61 */ 62 - static char *cifs_get_share_name(const char *node_name) 62 + static char * 63 + cifs_build_devname(char *nodename, const char *prepath) 63 64 { 64 - int len; 65 - char *UNC; 66 - char *pSep; 65 + size_t pplen; 66 + size_t unclen; 67 + char *dev; 68 + char *pos; 67 69 68 - len = strlen(node_name); 69 - UNC = kmalloc(len+2 /*for term null and additional \ if it's missed */, 70 - GFP_KERNEL); 71 - if (!UNC) 70 + /* skip over any preceding delimiters */ 71 + nodename += strspn(nodename, "\\"); 72 + if (!*nodename) 73 + return ERR_PTR(-EINVAL); 74 + 75 + /* get length of UNC and set pos to last char */ 76 + unclen = strlen(nodename); 77 + pos = nodename + unclen - 1; 78 + 79 + /* trim off any trailing delimiters */ 80 + while (*pos == '\\') { 81 + --pos; 82 + --unclen; 83 + } 84 + 85 + /* allocate a buffer: 86 + * +2 for preceding "//" 87 + * +1 for delimiter between UNC and prepath 88 + * +1 for trailing NULL 89 + */ 90 + pplen = prepath ? strlen(prepath) : 0; 91 + dev = kmalloc(2 + unclen + 1 + pplen + 1, GFP_KERNEL); 92 + if (!dev) 72 93 return ERR_PTR(-ENOMEM); 73 94 74 - /* get share name and server name */ 75 - if (node_name[1] != '\\') { 76 - UNC[0] = '\\'; 77 - strncpy(UNC+1, node_name, len); 78 - len++; 79 - UNC[len] = 0; 80 - } else { 81 - strncpy(UNC, node_name, len); 82 - UNC[len] = 0; 95 + pos = dev; 96 + /* add the initial "//" */ 97 + *pos = '/'; 98 + ++pos; 99 + *pos = '/'; 100 + ++pos; 101 + 102 + /* copy in the UNC portion from referral */ 103 + memcpy(pos, nodename, unclen); 104 + pos += unclen; 105 + 106 + /* copy the prefixpath remainder (if there is one) */ 107 + if (pplen) { 108 + *pos = '/'; 109 + ++pos; 110 + memcpy(pos, prepath, pplen); 111 + pos += pplen; 83 112 } 84 113 85 - /* find server name end */ 86 - pSep = memchr(UNC+2, '\\', len-2); 87 - if (!pSep) { 88 - cifs_dbg(VFS, "%s: no server name end in node name: %s\n", 89 - __func__, node_name); 90 - kfree(UNC); 91 - return ERR_PTR(-EINVAL); 92 - } 114 + /* NULL terminator */ 115 + *pos = '\0'; 93 116 94 - /* find sharename end */ 95 - pSep++; 96 - pSep = memchr(UNC+(pSep-UNC), '\\', len-(pSep-UNC)); 97 - if (pSep) { 98 - /* trim path up to sharename end 99 - * now we have share name in UNC */ 100 - *pSep = 0; 101 - } 102 - 103 - return UNC; 117 + convert_delimiter(dev, '/'); 118 + return dev; 104 119 } 105 120 106 121 ··· 140 123 { 141 124 int rc; 142 125 char *mountdata = NULL; 126 + const char *prepath = NULL; 143 127 int md_len; 144 128 char *tkn_e; 145 129 char *srvIP = NULL; ··· 150 132 if (sb_mountdata == NULL) 151 133 return ERR_PTR(-EINVAL); 152 134 153 - *devname = cifs_get_share_name(ref->node_name); 135 + if (strlen(fullpath) - ref->path_consumed) 136 + prepath = fullpath + ref->path_consumed; 137 + 138 + *devname = cifs_build_devname(ref->node_name, prepath); 154 139 if (IS_ERR(*devname)) { 155 140 rc = PTR_ERR(*devname); 156 141 *devname = NULL; ··· 167 146 goto compose_mount_options_err; 168 147 } 169 148 170 - /* md_len = strlen(...) + 12 for 'sep+prefixpath=' 171 - * assuming that we have 'unc=' and 'ip=' in 172 - * the original sb_mountdata 149 + /* 150 + * In most cases, we'll be building a shorter string than the original, 151 + * but we do have to assume that the address in the ip= option may be 152 + * much longer than the original. Add the max length of an address 153 + * string to the length of the original string to allow for worst case. 173 154 */ 174 - md_len = strlen(sb_mountdata) + rc + strlen(ref->node_name) + 12; 175 - mountdata = kzalloc(md_len+1, GFP_KERNEL); 155 + md_len = strlen(sb_mountdata) + INET6_ADDRSTRLEN; 156 + mountdata = kzalloc(md_len + 1, GFP_KERNEL); 176 157 if (mountdata == NULL) { 177 158 rc = -ENOMEM; 178 159 goto compose_mount_options_err; ··· 218 195 strncat(mountdata, &sep, 1); 219 196 strcat(mountdata, "ip="); 220 197 strcat(mountdata, srvIP); 221 - strncat(mountdata, &sep, 1); 222 - strcat(mountdata, "unc="); 223 - strcat(mountdata, *devname); 224 - 225 - /* find & copy prefixpath */ 226 - tkn_e = strchr(ref->node_name + 2, '\\'); 227 - if (tkn_e == NULL) { 228 - /* invalid unc, missing share name*/ 229 - rc = -EINVAL; 230 - goto compose_mount_options_err; 231 - } 232 - 233 - tkn_e = strchr(tkn_e + 1, '\\'); 234 - if (tkn_e || (strlen(fullpath) - ref->path_consumed)) { 235 - strncat(mountdata, &sep, 1); 236 - strcat(mountdata, "prefixpath="); 237 - if (tkn_e) 238 - strcat(mountdata, tkn_e + 1); 239 - strcat(mountdata, fullpath + ref->path_consumed); 240 - } 241 198 242 199 /*cifs_dbg(FYI, "%s: parent mountdata: %s\n", __func__, sb_mountdata);*/ 243 200 /*cifs_dbg(FYI, "%s: submount mountdata: %s\n", __func__, mountdata );*/
-3
fs/cifs/cifsfs.c
··· 372 372 cifs_show_security(s, tcon->ses->server); 373 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 375 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MULTIUSER) 379 376 seq_printf(s, ",multiuser"); 380 377 else if (tcon->ses->user_name)
+14 -9
fs/cifs/connect.c
··· 1061 1061 #endif 1062 1062 case Opt_sec_none: 1063 1063 vol->nullauth = 1; 1064 + vol->secFlg |= CIFSSEC_MAY_NTLM; 1064 1065 break; 1065 1066 default: 1066 1067 cifs_dbg(VFS, "bad security option: %s\n", value); ··· 1258 1257 vol->backupuid_specified = false; /* no backup intent for a user */ 1259 1258 vol->backupgid_specified = false; /* no backup intent for a group */ 1260 1259 1261 - /* 1262 - * For now, we ignore -EINVAL errors under the assumption that the 1263 - * unc= and prefixpath= options will be usable. 1264 - */ 1265 - if (cifs_parse_devname(devname, vol) == -ENOMEM) { 1266 - printk(KERN_ERR "CIFS: Unable to allocate memory to parse " 1267 - "device string.\n"); 1268 - goto out_nomem; 1260 + switch (cifs_parse_devname(devname, vol)) { 1261 + case 0: 1262 + break; 1263 + case -ENOMEM: 1264 + cifs_dbg(VFS, "Unable to allocate memory for devname.\n"); 1265 + goto cifs_parse_mount_err; 1266 + case -EINVAL: 1267 + cifs_dbg(VFS, "Malformed UNC in devname.\n"); 1268 + goto cifs_parse_mount_err; 1269 + default: 1270 + cifs_dbg(VFS, "Unknown error parsing devname.\n"); 1271 + goto cifs_parse_mount_err; 1269 1272 } 1270 1273 1271 1274 while ((data = strsep(&options, separator)) != NULL) { ··· 1831 1826 } 1832 1827 #endif 1833 1828 if (!vol->UNC) { 1834 - cifs_dbg(VFS, "CIFS mount error: No usable UNC path provided in device string or in unc= option!\n"); 1829 + cifs_dbg(VFS, "CIFS mount error: No usable UNC path provided in device string!\n"); 1835 1830 goto cifs_parse_mount_err; 1836 1831 } 1837 1832
+2 -2
fs/cifs/dns_resolve.c
··· 34 34 35 35 /** 36 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 38 * @ip_addr: Where to return the IP address. 39 39 * 40 40 * The IP address will be returned in string form, and the caller is ··· 64 64 hostname = unc + 2; 65 65 66 66 /* Search for server name delimiter */ 67 - sep = memchr(hostname, '\\', len); 67 + sep = memchr(hostname, '/', len); 68 68 if (sep) 69 69 len = sep - hostname; 70 70 else
+12 -2
fs/efivarfs/file.c
··· 44 44 45 45 bytes = efivar_entry_set_get_size(var, attributes, &datasize, 46 46 data, &set); 47 - if (!set && bytes) 47 + if (!set && bytes) { 48 + if (bytes == -ENOENT) 49 + bytes = -EIO; 48 50 goto out; 51 + } 49 52 50 53 if (bytes == -ENOENT) { 51 54 drop_nlink(inode); ··· 79 76 int err; 80 77 81 78 err = efivar_entry_size(var, &datasize); 82 - if (err) 79 + 80 + /* 81 + * efivarfs represents uncommitted variables with 82 + * zero-length files. Reading them should return EOF. 83 + */ 84 + if (err == -ENOENT) 85 + return 0; 86 + else if (err) 83 87 return err; 84 88 85 89 data = kmalloc(datasize + sizeof(attributes), GFP_KERNEL);
+6 -4
fs/hpfs/dir.c
··· 33 33 if (whence == SEEK_DATA || whence == SEEK_HOLE) 34 34 return -EINVAL; 35 35 36 + mutex_lock(&i->i_mutex); 36 37 hpfs_lock(s); 37 38 38 39 /*printk("dir lseek\n");*/ 39 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 41 pos = ((loff_t) hpfs_de_as_down_as_possible(s, hpfs_inode->i_dno) << 4) + 1; 42 42 while (pos != new_off) { 43 43 if (map_pos_dirent(i, &pos, &qbh)) hpfs_brelse4(&qbh); 44 44 else goto fail; 45 45 if (pos == 12) goto fail; 46 46 } 47 - mutex_unlock(&i->i_mutex); 47 + hpfs_add_pos(i, &filp->f_pos); 48 48 ok: 49 + filp->f_pos = new_off; 49 50 hpfs_unlock(s); 50 - return filp->f_pos = new_off; 51 - fail: 52 51 mutex_unlock(&i->i_mutex); 52 + return new_off; 53 + fail: 53 54 /*printk("illegal lseek: %016llx\n", new_off);*/ 54 55 hpfs_unlock(s); 56 + mutex_unlock(&i->i_mutex); 55 57 return -ESPIPE; 56 58 } 57 59
+1 -1
fs/nfs/nfs4proc.c
··· 1078 1078 struct nfs4_state *state = opendata->state; 1079 1079 struct nfs_inode *nfsi = NFS_I(state->inode); 1080 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 1082 fmode_t fmode = opendata->o_arg.fmode; 1083 1083 nfs4_stateid stateid; 1084 1084 int ret = -EAGAIN;
+2
fs/nfs/super.c
··· 1942 1942 args->namlen = data->namlen; 1943 1943 args->bsize = data->bsize; 1944 1944 1945 + args->auth_flavors[0] = RPC_AUTH_UNIX; 1945 1946 if (data->flags & NFS_MOUNT_SECFLAVOUR) 1946 1947 args->auth_flavors[0] = data->pseudoflavor; 1947 1948 if (!args->nfs_server.hostname) ··· 2638 2637 goto out_no_address; 2639 2638 args->nfs_server.port = ntohs(((struct sockaddr_in *)sap)->sin_port); 2640 2639 2640 + args->auth_flavors[0] = RPC_AUTH_UNIX; 2641 2641 if (data->auth_flavourlen) { 2642 2642 if (data->auth_flavourlen > 1) 2643 2643 goto out_inval_auth;
+2 -1
fs/pnode.c
··· 83 83 if (peer_mnt == mnt) 84 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 88 mnt_release_group_id(mnt); 88 89 89 90 list_del_init(&mnt->mnt_share);
+1 -1
fs/qnx6/dir.c
··· 120 120 struct inode *inode = file_inode(filp); 121 121 struct super_block *s = inode->i_sb; 122 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 124 unsigned long npages = dir_pages(inode); 125 125 unsigned long n = pos >> PAGE_CACHE_SHIFT; 126 126 unsigned start = (pos & ~PAGE_CACHE_MASK) / QNX6_DIR_ENTRY_SIZE;
+2
fs/reiserfs/dir.c
··· 204 204 next_pos = deh_offset(deh) + 1; 205 205 206 206 if (item_moved(&tmp_ih, &path_to_entry)) { 207 + set_cpu_key_k_offset(&pos_key, 208 + next_pos); 207 209 goto research; 208 210 } 209 211 } /* for */
+7 -2
fs/reiserfs/inode.c
··· 1811 1811 TYPE_STAT_DATA, SD_SIZE, MAX_US_INT); 1812 1812 memcpy(INODE_PKEY(inode), &(ih.ih_key), KEY_SIZE); 1813 1813 args.dirid = le32_to_cpu(ih.ih_key.k_dir_id); 1814 - if (insert_inode_locked4(inode, args.objectid, 1815 - reiserfs_find_actor, &args) < 0) { 1814 + 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 1820 err = -EINVAL; 1817 1821 goto out_bad_inode; 1818 1822 } 1823 + 1819 1824 if (old_format_only(sb)) 1820 1825 /* not a perfect generation count, as object ids can be reused, but 1821 1826 ** this is as good as reiserfs can do right now.
+13 -1
fs/reiserfs/xattr.c
··· 318 318 static int chown_one_xattr(struct dentry *dentry, void *data) 319 319 { 320 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 336 /* No i_mutex, but the inode is unconnected. */
+3
fs/reiserfs/xattr_acl.c
··· 443 443 int depth; 444 444 int error; 445 445 446 + if (IS_PRIVATE(inode)) 447 + return 0; 448 + 446 449 if (S_ISLNK(inode->i_mode)) 447 450 return -EOPNOTSUPP; 448 451
+47 -24
fs/xfs/xfs_attr_leaf.c
··· 1412 1412 name_rmt->valuelen = 0; 1413 1413 name_rmt->valueblk = 0; 1414 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 1417 xfs_trans_log_buf(args->trans, bp, 1418 1418 XFS_DA_LOGRANGE(leaf, xfs_attr3_leaf_name(leaf, args->index), ··· 1445 1445 STATIC void 1446 1446 xfs_attr3_leaf_compact( 1447 1447 struct xfs_da_args *args, 1448 - struct xfs_attr3_icleaf_hdr *ichdr_d, 1448 + struct xfs_attr3_icleaf_hdr *ichdr_dst, 1449 1449 struct xfs_buf *bp) 1450 1450 { 1451 - xfs_attr_leafblock_t *leaf_s, *leaf_d; 1452 - struct xfs_attr3_icleaf_hdr ichdr_s; 1451 + struct xfs_attr_leafblock *leaf_src; 1452 + struct xfs_attr_leafblock *leaf_dst; 1453 + struct xfs_attr3_icleaf_hdr ichdr_src; 1453 1454 struct xfs_trans *trans = args->trans; 1454 1455 struct xfs_mount *mp = trans->t_mountp; 1455 1456 char *tmpbuffer; ··· 1458 1457 trace_xfs_attr_leaf_compact(args); 1459 1458 1460 1459 tmpbuffer = kmem_alloc(XFS_LBSIZE(mp), KM_SLEEP); 1461 - ASSERT(tmpbuffer != NULL); 1462 1460 memcpy(tmpbuffer, bp->b_addr, XFS_LBSIZE(mp)); 1463 1461 memset(bp->b_addr, 0, XFS_LBSIZE(mp)); 1462 + leaf_src = (xfs_attr_leafblock_t *)tmpbuffer; 1463 + leaf_dst = bp->b_addr; 1464 1464 1465 1465 /* 1466 - * Copy basic information 1466 + * Copy the on-disk header back into the destination buffer to ensure 1467 + * all the information in the header that is not part of the incore 1468 + * header structure is preserved. 1467 1469 */ 1468 - leaf_s = (xfs_attr_leafblock_t *)tmpbuffer; 1469 - leaf_d = bp->b_addr; 1470 - ichdr_s = *ichdr_d; /* struct copy */ 1471 - ichdr_d->firstused = XFS_LBSIZE(mp); 1472 - ichdr_d->usedbytes = 0; 1473 - ichdr_d->count = 0; 1474 - ichdr_d->holes = 0; 1475 - ichdr_d->freemap[0].base = xfs_attr3_leaf_hdr_size(leaf_s); 1476 - ichdr_d->freemap[0].size = ichdr_d->firstused - ichdr_d->freemap[0].base; 1470 + memcpy(bp->b_addr, tmpbuffer, xfs_attr3_leaf_hdr_size(leaf_src)); 1471 + 1472 + /* Initialise the incore headers */ 1473 + ichdr_src = *ichdr_dst; /* struct copy */ 1474 + ichdr_dst->firstused = XFS_LBSIZE(mp); 1475 + ichdr_dst->usedbytes = 0; 1476 + ichdr_dst->count = 0; 1477 + ichdr_dst->holes = 0; 1478 + ichdr_dst->freemap[0].base = xfs_attr3_leaf_hdr_size(leaf_src); 1479 + ichdr_dst->freemap[0].size = ichdr_dst->firstused - 1480 + ichdr_dst->freemap[0].base; 1481 + 1482 + 1483 + /* write the header back to initialise the underlying buffer */ 1484 + xfs_attr3_leaf_hdr_to_disk(leaf_dst, ichdr_dst); 1477 1485 1478 1486 /* 1479 1487 * Copy all entry's in the same (sorted) order, 1480 1488 * but allocate name/value pairs packed and in sequence. 1481 1489 */ 1482 - xfs_attr3_leaf_moveents(leaf_s, &ichdr_s, 0, leaf_d, ichdr_d, 0, 1483 - ichdr_s.count, mp); 1490 + xfs_attr3_leaf_moveents(leaf_src, &ichdr_src, 0, leaf_dst, ichdr_dst, 0, 1491 + ichdr_src.count, mp); 1484 1492 /* 1485 1493 * this logs the entire buffer, but the caller must write the header 1486 1494 * back to the buffer when it is finished modifying it. ··· 2191 2181 struct xfs_attr_leafblock *tmp_leaf; 2192 2182 struct xfs_attr3_icleaf_hdr tmphdr; 2193 2183 2194 - tmp_leaf = kmem_alloc(state->blocksize, KM_SLEEP); 2195 - memset(tmp_leaf, 0, state->blocksize); 2196 - memset(&tmphdr, 0, sizeof(tmphdr)); 2184 + tmp_leaf = kmem_zalloc(state->blocksize, KM_SLEEP); 2197 2185 2186 + /* 2187 + * Copy the header into the temp leaf so that all the stuff 2188 + * not in the incore header is present and gets copied back in 2189 + * once we've moved all the entries. 2190 + */ 2191 + memcpy(tmp_leaf, save_leaf, xfs_attr3_leaf_hdr_size(save_leaf)); 2192 + 2193 + memset(&tmphdr, 0, sizeof(tmphdr)); 2198 2194 tmphdr.magic = savehdr.magic; 2199 2195 tmphdr.forw = savehdr.forw; 2200 2196 tmphdr.back = savehdr.back; 2201 2197 tmphdr.firstused = state->blocksize; 2198 + 2199 + /* write the header to the temp buffer to initialise it */ 2200 + xfs_attr3_leaf_hdr_to_disk(tmp_leaf, &tmphdr); 2201 + 2202 2202 if (xfs_attr3_leaf_order(save_blk->bp, &savehdr, 2203 2203 drop_blk->bp, &drophdr)) { 2204 2204 xfs_attr3_leaf_moveents(drop_leaf, &drophdr, 0, ··· 2354 2334 args->index = probe; 2355 2335 args->valuelen = be32_to_cpu(name_rmt->valuelen); 2356 2336 args->rmtblkno = be32_to_cpu(name_rmt->valueblk); 2357 - args->rmtblkcnt = XFS_B_TO_FSB(args->dp->i_mount, 2358 - args->valuelen); 2337 + args->rmtblkcnt = xfs_attr3_rmt_blocks( 2338 + args->dp->i_mount, 2339 + args->valuelen); 2359 2340 return XFS_ERROR(EEXIST); 2360 2341 } 2361 2342 } ··· 2407 2386 ASSERT(memcmp(args->name, name_rmt->name, args->namelen) == 0); 2408 2387 valuelen = be32_to_cpu(name_rmt->valuelen); 2409 2388 args->rmtblkno = be32_to_cpu(name_rmt->valueblk); 2410 - args->rmtblkcnt = XFS_B_TO_FSB(args->dp->i_mount, valuelen); 2389 + args->rmtblkcnt = xfs_attr3_rmt_blocks(args->dp->i_mount, 2390 + valuelen); 2411 2391 if (args->flags & ATTR_KERNOVAL) { 2412 2392 args->valuelen = valuelen; 2413 2393 return 0; ··· 2734 2712 args.valuelen = valuelen; 2735 2713 args.value = kmem_alloc(valuelen, KM_SLEEP | KM_NOFS); 2736 2714 args.rmtblkno = be32_to_cpu(name_rmt->valueblk); 2737 - args.rmtblkcnt = XFS_B_TO_FSB(args.dp->i_mount, valuelen); 2715 + args.rmtblkcnt = xfs_attr3_rmt_blocks( 2716 + args.dp->i_mount, valuelen); 2738 2717 retval = xfs_attr_rmtval_get(&args); 2739 2718 if (retval) 2740 2719 return retval;
+249 -159
fs/xfs/xfs_attr_remote.c
··· 47 47 * Each contiguous block has a header, so it is not just a simple attribute 48 48 * length to FSB conversion. 49 49 */ 50 - static int 50 + int 51 51 xfs_attr3_rmt_blocks( 52 52 struct xfs_mount *mp, 53 53 int attrlen) 54 54 { 55 - int buflen = XFS_ATTR3_RMT_BUF_SPACE(mp, 56 - mp->m_sb.sb_blocksize); 57 - return (attrlen + buflen - 1) / buflen; 55 + if (xfs_sb_version_hascrc(&mp->m_sb)) { 56 + int buflen = XFS_ATTR3_RMT_BUF_SPACE(mp, mp->m_sb.sb_blocksize); 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 91 static bool 61 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; 65 - struct xfs_attr3_rmt_hdr *rmt = bp->b_addr; 98 + struct xfs_attr3_rmt_hdr *rmt = ptr; 66 99 67 100 if (!xfs_sb_version_hascrc(&mp->m_sb)) 68 101 return false; ··· 103 70 return false; 104 71 if (!uuid_equal(&rmt->rm_uuid, &mp->m_sb.sb_uuid)) 105 72 return false; 106 - if (bp->b_bn != be64_to_cpu(rmt->rm_blkno)) 73 + if (be64_to_cpu(rmt->rm_blkno) != bno) 74 + return false; 75 + if (be32_to_cpu(rmt->rm_bytes) > fsbsize - sizeof(*rmt)) 107 76 return false; 108 77 if (be32_to_cpu(rmt->rm_offset) + 109 78 be32_to_cpu(rmt->rm_bytes) >= XATTR_SIZE_MAX) ··· 121 86 struct xfs_buf *bp) 122 87 { 123 88 struct xfs_mount *mp = bp->b_target->bt_mount; 89 + char *ptr; 90 + int len; 91 + bool corrupt = false; 92 + xfs_daddr_t bno; 124 93 125 94 /* no verification of non-crc buffers */ 126 95 if (!xfs_sb_version_hascrc(&mp->m_sb)) 127 96 return; 128 97 129 - if (!xfs_verify_cksum(bp->b_addr, BBTOB(bp->b_length), 130 - XFS_ATTR3_RMT_CRC_OFF) || 131 - !xfs_attr3_rmt_verify(bp)) { 98 + ptr = bp->b_addr; 99 + bno = bp->b_bn; 100 + len = BBTOB(bp->b_length); 101 + ASSERT(len >= XFS_LBSIZE(mp)); 102 + 103 + while (len > 0) { 104 + if (!xfs_verify_cksum(ptr, XFS_LBSIZE(mp), 105 + XFS_ATTR3_RMT_CRC_OFF)) { 106 + corrupt = true; 107 + break; 108 + } 109 + if (!xfs_attr3_rmt_verify(mp, ptr, XFS_LBSIZE(mp), bno)) { 110 + corrupt = true; 111 + break; 112 + } 113 + len -= XFS_LBSIZE(mp); 114 + ptr += XFS_LBSIZE(mp); 115 + bno += mp->m_bsize; 116 + } 117 + 118 + if (corrupt) { 132 119 XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, bp->b_addr); 133 120 xfs_buf_ioerror(bp, EFSCORRUPTED); 134 - } 121 + } else 122 + ASSERT(len == 0); 135 123 } 136 124 137 125 static void ··· 163 105 { 164 106 struct xfs_mount *mp = bp->b_target->bt_mount; 165 107 struct xfs_buf_log_item *bip = bp->b_fspriv; 108 + char *ptr; 109 + int len; 110 + xfs_daddr_t bno; 166 111 167 112 /* no verification of non-crc buffers */ 168 113 if (!xfs_sb_version_hascrc(&mp->m_sb)) 169 114 return; 170 115 171 - if (!xfs_attr3_rmt_verify(bp)) { 172 - XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, bp->b_addr); 173 - xfs_buf_ioerror(bp, EFSCORRUPTED); 174 - return; 175 - } 116 + ptr = bp->b_addr; 117 + bno = bp->b_bn; 118 + len = BBTOB(bp->b_length); 119 + ASSERT(len >= XFS_LBSIZE(mp)); 176 120 177 - if (bip) { 178 - struct xfs_attr3_rmt_hdr *rmt = bp->b_addr; 179 - rmt->rm_lsn = cpu_to_be64(bip->bli_item.li_lsn); 121 + while (len > 0) { 122 + if (!xfs_attr3_rmt_verify(mp, ptr, XFS_LBSIZE(mp), bno)) { 123 + XFS_CORRUPTION_ERROR(__func__, 124 + XFS_ERRLEVEL_LOW, mp, bp->b_addr); 125 + xfs_buf_ioerror(bp, EFSCORRUPTED); 126 + return; 127 + } 128 + if (bip) { 129 + struct xfs_attr3_rmt_hdr *rmt; 130 + 131 + rmt = (struct xfs_attr3_rmt_hdr *)ptr; 132 + rmt->rm_lsn = cpu_to_be64(bip->bli_item.li_lsn); 133 + } 134 + xfs_update_cksum(ptr, XFS_LBSIZE(mp), XFS_ATTR3_RMT_CRC_OFF); 135 + 136 + len -= XFS_LBSIZE(mp); 137 + ptr += XFS_LBSIZE(mp); 138 + bno += mp->m_bsize; 180 139 } 181 - xfs_update_cksum(bp->b_addr, BBTOB(bp->b_length), 182 - XFS_ATTR3_RMT_CRC_OFF); 140 + ASSERT(len == 0); 183 141 } 184 142 185 143 const struct xfs_buf_ops xfs_attr3_rmt_buf_ops = { ··· 203 129 .verify_write = xfs_attr3_rmt_write_verify, 204 130 }; 205 131 206 - static int 132 + STATIC int 207 133 xfs_attr3_rmt_hdr_set( 208 134 struct xfs_mount *mp, 135 + void *ptr, 209 136 xfs_ino_t ino, 210 137 uint32_t offset, 211 138 uint32_t size, 212 - struct xfs_buf *bp) 139 + xfs_daddr_t bno) 213 140 { 214 - struct xfs_attr3_rmt_hdr *rmt = bp->b_addr; 141 + struct xfs_attr3_rmt_hdr *rmt = ptr; 215 142 216 143 if (!xfs_sb_version_hascrc(&mp->m_sb)) 217 144 return 0; ··· 222 147 rmt->rm_bytes = cpu_to_be32(size); 223 148 uuid_copy(&rmt->rm_uuid, &mp->m_sb.sb_uuid); 224 149 rmt->rm_owner = cpu_to_be64(ino); 225 - rmt->rm_blkno = cpu_to_be64(bp->b_bn); 226 - bp->b_ops = &xfs_attr3_rmt_buf_ops; 150 + rmt->rm_blkno = cpu_to_be64(bno); 227 151 228 152 return sizeof(struct xfs_attr3_rmt_hdr); 229 153 } 230 154 231 155 /* 232 - * Checking of the remote attribute header is split into two parts. the verifier 233 - * does CRC, location and bounds checking, the unpacking function checks the 234 - * attribute parameters and owner. 156 + * Helper functions to copy attribute data in and out of the one disk extents 235 157 */ 236 - static bool 237 - xfs_attr3_rmt_hdr_ok( 238 - struct xfs_mount *mp, 239 - xfs_ino_t ino, 240 - uint32_t offset, 241 - uint32_t size, 242 - struct xfs_buf *bp) 158 + STATIC int 159 + xfs_attr_rmtval_copyout( 160 + struct xfs_mount *mp, 161 + struct xfs_buf *bp, 162 + xfs_ino_t ino, 163 + int *offset, 164 + int *valuelen, 165 + char **dst) 243 166 { 244 - struct xfs_attr3_rmt_hdr *rmt = bp->b_addr; 167 + char *src = bp->b_addr; 168 + xfs_daddr_t bno = bp->b_bn; 169 + int len = BBTOB(bp->b_length); 245 170 246 - if (offset != be32_to_cpu(rmt->rm_offset)) 247 - return false; 248 - if (size != be32_to_cpu(rmt->rm_bytes)) 249 - return false; 250 - if (ino != be64_to_cpu(rmt->rm_owner)) 251 - return false; 171 + ASSERT(len >= XFS_LBSIZE(mp)); 252 172 253 - /* ok */ 254 - return true; 173 + while (len > 0 && *valuelen > 0) { 174 + int hdr_size = 0; 175 + int byte_cnt = XFS_ATTR3_RMT_BUF_SPACE(mp, XFS_LBSIZE(mp)); 176 + 177 + byte_cnt = min_t(int, *valuelen, byte_cnt); 178 + 179 + if (xfs_sb_version_hascrc(&mp->m_sb)) { 180 + if (!xfs_attr3_rmt_hdr_ok(mp, src, ino, *offset, 181 + byte_cnt, bno)) { 182 + xfs_alert(mp, 183 + "remote attribute header mismatch bno/off/len/owner (0x%llx/0x%x/Ox%x/0x%llx)", 184 + bno, *offset, byte_cnt, ino); 185 + return EFSCORRUPTED; 186 + } 187 + hdr_size = sizeof(struct xfs_attr3_rmt_hdr); 188 + } 189 + 190 + memcpy(*dst, src + hdr_size, byte_cnt); 191 + 192 + /* roll buffer forwards */ 193 + len -= XFS_LBSIZE(mp); 194 + src += XFS_LBSIZE(mp); 195 + bno += mp->m_bsize; 196 + 197 + /* roll attribute data forwards */ 198 + *valuelen -= byte_cnt; 199 + *dst += byte_cnt; 200 + *offset += byte_cnt; 201 + } 202 + return 0; 203 + } 204 + 205 + STATIC void 206 + xfs_attr_rmtval_copyin( 207 + struct xfs_mount *mp, 208 + struct xfs_buf *bp, 209 + xfs_ino_t ino, 210 + int *offset, 211 + int *valuelen, 212 + char **src) 213 + { 214 + char *dst = bp->b_addr; 215 + xfs_daddr_t bno = bp->b_bn; 216 + int len = BBTOB(bp->b_length); 217 + 218 + ASSERT(len >= XFS_LBSIZE(mp)); 219 + 220 + while (len > 0 && *valuelen > 0) { 221 + int hdr_size; 222 + int byte_cnt = XFS_ATTR3_RMT_BUF_SPACE(mp, XFS_LBSIZE(mp)); 223 + 224 + byte_cnt = min(*valuelen, byte_cnt); 225 + hdr_size = xfs_attr3_rmt_hdr_set(mp, dst, ino, *offset, 226 + byte_cnt, bno); 227 + 228 + memcpy(dst + hdr_size, *src, byte_cnt); 229 + 230 + /* 231 + * If this is the last block, zero the remainder of it. 232 + * Check that we are actually the last block, too. 233 + */ 234 + if (byte_cnt + hdr_size < XFS_LBSIZE(mp)) { 235 + ASSERT(*valuelen - byte_cnt == 0); 236 + ASSERT(len == XFS_LBSIZE(mp)); 237 + memset(dst + hdr_size + byte_cnt, 0, 238 + XFS_LBSIZE(mp) - hdr_size - byte_cnt); 239 + } 240 + 241 + /* roll buffer forwards */ 242 + len -= XFS_LBSIZE(mp); 243 + dst += XFS_LBSIZE(mp); 244 + bno += mp->m_bsize; 245 + 246 + /* roll attribute data forwards */ 247 + *valuelen -= byte_cnt; 248 + *src += byte_cnt; 249 + *offset += byte_cnt; 250 + } 255 251 } 256 252 257 253 /* ··· 336 190 struct xfs_bmbt_irec map[ATTR_RMTVALUE_MAPSIZE]; 337 191 struct xfs_mount *mp = args->dp->i_mount; 338 192 struct xfs_buf *bp; 339 - xfs_daddr_t dblkno; 340 193 xfs_dablk_t lblkno = args->rmtblkno; 341 - void *dst = args->value; 194 + char *dst = args->value; 342 195 int valuelen = args->valuelen; 343 196 int nmap; 344 197 int error; 345 - int blkcnt; 198 + int blkcnt = args->rmtblkcnt; 346 199 int i; 347 200 int offset = 0; 348 201 ··· 352 207 while (valuelen > 0) { 353 208 nmap = ATTR_RMTVALUE_MAPSIZE; 354 209 error = xfs_bmapi_read(args->dp, (xfs_fileoff_t)lblkno, 355 - args->rmtblkcnt, map, &nmap, 210 + blkcnt, map, &nmap, 356 211 XFS_BMAPI_ATTRFORK); 357 212 if (error) 358 213 return error; 359 214 ASSERT(nmap >= 1); 360 215 361 216 for (i = 0; (i < nmap) && (valuelen > 0); i++) { 362 - int byte_cnt; 363 - char *src; 217 + xfs_daddr_t dblkno; 218 + int dblkcnt; 364 219 365 220 ASSERT((map[i].br_startblock != DELAYSTARTBLOCK) && 366 221 (map[i].br_startblock != HOLESTARTBLOCK)); 367 222 dblkno = XFS_FSB_TO_DADDR(mp, map[i].br_startblock); 368 - blkcnt = XFS_FSB_TO_BB(mp, map[i].br_blockcount); 223 + dblkcnt = XFS_FSB_TO_BB(mp, map[i].br_blockcount); 369 224 error = xfs_trans_read_buf(mp, NULL, mp->m_ddev_targp, 370 - dblkno, blkcnt, 0, &bp, 225 + dblkno, dblkcnt, 0, &bp, 371 226 &xfs_attr3_rmt_buf_ops); 372 227 if (error) 373 228 return error; 374 229 375 - byte_cnt = min_t(int, valuelen, BBTOB(bp->b_length)); 376 - byte_cnt = XFS_ATTR3_RMT_BUF_SPACE(mp, byte_cnt); 377 - 378 - src = bp->b_addr; 379 - if (xfs_sb_version_hascrc(&mp->m_sb)) { 380 - if (!xfs_attr3_rmt_hdr_ok(mp, args->dp->i_ino, 381 - offset, byte_cnt, bp)) { 382 - xfs_alert(mp, 383 - "remote attribute header does not match required off/len/owner (0x%x/Ox%x,0x%llx)", 384 - offset, byte_cnt, args->dp->i_ino); 385 - xfs_buf_relse(bp); 386 - return EFSCORRUPTED; 387 - 388 - } 389 - 390 - src += sizeof(struct xfs_attr3_rmt_hdr); 391 - } 392 - 393 - memcpy(dst, src, byte_cnt); 230 + error = xfs_attr_rmtval_copyout(mp, bp, args->dp->i_ino, 231 + &offset, &valuelen, 232 + &dst); 394 233 xfs_buf_relse(bp); 234 + if (error) 235 + return error; 395 236 396 - offset += byte_cnt; 397 - dst += byte_cnt; 398 - valuelen -= byte_cnt; 399 - 237 + /* roll attribute extent map forwards */ 400 238 lblkno += map[i].br_blockcount; 239 + blkcnt -= map[i].br_blockcount; 401 240 } 402 241 } 403 242 ASSERT(valuelen == 0); ··· 399 270 struct xfs_inode *dp = args->dp; 400 271 struct xfs_mount *mp = dp->i_mount; 401 272 struct xfs_bmbt_irec map; 402 - struct xfs_buf *bp; 403 - xfs_daddr_t dblkno; 404 273 xfs_dablk_t lblkno; 405 274 xfs_fileoff_t lfileoff = 0; 406 - void *src = args->value; 275 + char *src = args->value; 407 276 int blkcnt; 408 277 int valuelen; 409 278 int nmap; 410 279 int error; 411 - int hdrcnt = 0; 412 - bool crcs = xfs_sb_version_hascrc(&mp->m_sb); 413 280 int offset = 0; 414 281 415 282 trace_xfs_attr_rmtval_set(args); ··· 414 289 * Find a "hole" in the attribute address space large enough for 415 290 * us to drop the new attribute's value into. Because CRC enable 416 291 * attributes have headers, we can't just do a straight byte to FSB 417 - * conversion. We calculate the worst case block count in this case 418 - * and we may not need that many, so we have to handle this when 419 - * allocating the blocks below. 292 + * conversion and have to take the header space into account. 420 293 */ 421 - if (!crcs) 422 - blkcnt = XFS_B_TO_FSB(mp, args->valuelen); 423 - else 424 - blkcnt = xfs_attr3_rmt_blocks(mp, args->valuelen); 425 - 294 + blkcnt = xfs_attr3_rmt_blocks(mp, args->valuelen); 426 295 error = xfs_bmap_first_unused(args->trans, args->dp, blkcnt, &lfileoff, 427 296 XFS_ATTR_FORK); 428 297 if (error) 429 298 return error; 430 - 431 - /* Start with the attribute data. We'll allocate the rest afterwards. */ 432 - if (crcs) 433 - blkcnt = XFS_B_TO_FSB(mp, args->valuelen); 434 299 435 300 args->rmtblkno = lblkno = (xfs_dablk_t)lfileoff; 436 301 args->rmtblkcnt = blkcnt; ··· 464 349 (map.br_startblock != HOLESTARTBLOCK)); 465 350 lblkno += map.br_blockcount; 466 351 blkcnt -= map.br_blockcount; 467 - hdrcnt++; 468 - 469 - /* 470 - * If we have enough blocks for the attribute data, calculate 471 - * how many extra blocks we need for headers. We might run 472 - * through this multiple times in the case that the additional 473 - * headers in the blocks needed for the data fragments spills 474 - * into requiring more blocks. e.g. for 512 byte blocks, we'll 475 - * spill for another block every 9 headers we require in this 476 - * loop. 477 - */ 478 - if (crcs && blkcnt == 0) { 479 - int total_len; 480 - 481 - total_len = args->valuelen + 482 - hdrcnt * sizeof(struct xfs_attr3_rmt_hdr); 483 - blkcnt = XFS_B_TO_FSB(mp, total_len); 484 - blkcnt -= args->rmtblkcnt; 485 - args->rmtblkcnt += blkcnt; 486 - } 487 352 488 353 /* 489 354 * Start the next trans in the chain. ··· 480 385 * the INCOMPLETE flag. 481 386 */ 482 387 lblkno = args->rmtblkno; 388 + blkcnt = args->rmtblkcnt; 483 389 valuelen = args->valuelen; 484 390 while (valuelen > 0) { 485 - int byte_cnt; 486 - char *buf; 391 + struct xfs_buf *bp; 392 + xfs_daddr_t dblkno; 393 + int dblkcnt; 487 394 488 - /* 489 - * Try to remember where we decided to put the value. 490 - */ 395 + ASSERT(blkcnt > 0); 396 + 491 397 xfs_bmap_init(args->flist, args->firstblock); 492 398 nmap = 1; 493 399 error = xfs_bmapi_read(dp, (xfs_fileoff_t)lblkno, 494 - args->rmtblkcnt, &map, &nmap, 400 + blkcnt, &map, &nmap, 495 401 XFS_BMAPI_ATTRFORK); 496 402 if (error) 497 403 return(error); ··· 501 405 (map.br_startblock != HOLESTARTBLOCK)); 502 406 503 407 dblkno = XFS_FSB_TO_DADDR(mp, map.br_startblock), 504 - blkcnt = XFS_FSB_TO_BB(mp, map.br_blockcount); 408 + dblkcnt = XFS_FSB_TO_BB(mp, map.br_blockcount); 505 409 506 - bp = xfs_buf_get(mp->m_ddev_targp, dblkno, blkcnt, 0); 410 + bp = xfs_buf_get(mp->m_ddev_targp, dblkno, dblkcnt, 0); 507 411 if (!bp) 508 412 return ENOMEM; 509 413 bp->b_ops = &xfs_attr3_rmt_buf_ops; 510 414 511 - byte_cnt = BBTOB(bp->b_length); 512 - byte_cnt = XFS_ATTR3_RMT_BUF_SPACE(mp, byte_cnt); 513 - if (valuelen < byte_cnt) 514 - byte_cnt = valuelen; 515 - 516 - buf = bp->b_addr; 517 - buf += xfs_attr3_rmt_hdr_set(mp, dp->i_ino, offset, 518 - byte_cnt, bp); 519 - memcpy(buf, src, byte_cnt); 520 - 521 - if (byte_cnt < BBTOB(bp->b_length)) 522 - xfs_buf_zero(bp, byte_cnt, 523 - BBTOB(bp->b_length) - byte_cnt); 415 + xfs_attr_rmtval_copyin(mp, bp, args->dp->i_ino, &offset, 416 + &valuelen, &src); 524 417 525 418 error = xfs_bwrite(bp); /* GROT: NOTE: synchronous write */ 526 419 xfs_buf_relse(bp); 527 420 if (error) 528 421 return error; 529 422 530 - src += byte_cnt; 531 - valuelen -= byte_cnt; 532 - offset += byte_cnt; 533 - hdrcnt--; 534 423 424 + /* roll attribute extent map forwards */ 535 425 lblkno += map.br_blockcount; 426 + blkcnt -= map.br_blockcount; 536 427 } 537 428 ASSERT(valuelen == 0); 538 - ASSERT(hdrcnt == 0); 539 429 return 0; 540 430 } 541 431 ··· 530 448 * out-of-line buffer that it is stored on. 531 449 */ 532 450 int 533 - xfs_attr_rmtval_remove(xfs_da_args_t *args) 451 + xfs_attr_rmtval_remove( 452 + struct xfs_da_args *args) 534 453 { 535 - xfs_mount_t *mp; 536 - xfs_bmbt_irec_t map; 537 - xfs_buf_t *bp; 538 - xfs_daddr_t dblkno; 539 - xfs_dablk_t lblkno; 540 - int valuelen, blkcnt, nmap, error, done, committed; 454 + struct xfs_mount *mp = args->dp->i_mount; 455 + xfs_dablk_t lblkno; 456 + int blkcnt; 457 + int error; 458 + int done; 541 459 542 460 trace_xfs_attr_rmtval_remove(args); 543 461 544 - mp = args->dp->i_mount; 545 - 546 462 /* 547 - * Roll through the "value", invalidating the attribute value's 548 - * blocks. 463 + * Roll through the "value", invalidating the attribute value's blocks. 464 + * Note that args->rmtblkcnt is the minimum number of data blocks we'll 465 + * see for a CRC enabled remote attribute. Each extent will have a 466 + * header, and so we may have more blocks than we realise here. If we 467 + * fail to map the blocks correctly, we'll have problems with the buffer 468 + * lookups. 549 469 */ 550 470 lblkno = args->rmtblkno; 551 - valuelen = args->rmtblkcnt; 552 - while (valuelen > 0) { 471 + blkcnt = args->rmtblkcnt; 472 + while (blkcnt > 0) { 473 + struct xfs_bmbt_irec map; 474 + struct xfs_buf *bp; 475 + xfs_daddr_t dblkno; 476 + int dblkcnt; 477 + int nmap; 478 + 553 479 /* 554 480 * Try to remember where we decided to put the value. 555 481 */ 556 482 nmap = 1; 557 483 error = xfs_bmapi_read(args->dp, (xfs_fileoff_t)lblkno, 558 - args->rmtblkcnt, &map, &nmap, 559 - XFS_BMAPI_ATTRFORK); 484 + blkcnt, &map, &nmap, XFS_BMAPI_ATTRFORK); 560 485 if (error) 561 486 return(error); 562 487 ASSERT(nmap == 1); ··· 571 482 (map.br_startblock != HOLESTARTBLOCK)); 572 483 573 484 dblkno = XFS_FSB_TO_DADDR(mp, map.br_startblock), 574 - blkcnt = XFS_FSB_TO_BB(mp, map.br_blockcount); 485 + dblkcnt = XFS_FSB_TO_BB(mp, map.br_blockcount); 575 486 576 487 /* 577 488 * If the "remote" value is in the cache, remove it. 578 489 */ 579 - bp = xfs_incore(mp->m_ddev_targp, dblkno, blkcnt, XBF_TRYLOCK); 490 + bp = xfs_incore(mp->m_ddev_targp, dblkno, dblkcnt, XBF_TRYLOCK); 580 491 if (bp) { 581 492 xfs_buf_stale(bp); 582 493 xfs_buf_relse(bp); 583 494 bp = NULL; 584 495 } 585 496 586 - valuelen -= map.br_blockcount; 587 - 588 497 lblkno += map.br_blockcount; 498 + blkcnt -= map.br_blockcount; 589 499 } 590 500 591 501 /* ··· 594 506 blkcnt = args->rmtblkcnt; 595 507 done = 0; 596 508 while (!done) { 509 + int committed; 510 + 597 511 xfs_bmap_init(args->flist, args->firstblock); 598 512 error = xfs_bunmapi(args->trans, args->dp, lblkno, blkcnt, 599 513 XFS_BMAPI_ATTRFORK | XFS_BMAPI_METADATA,
+10
fs/xfs/xfs_attr_remote.h
··· 20 20 21 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 31 struct xfs_attr3_rmt_hdr { 24 32 __be32 rm_magic; 25 33 __be32 rm_offset; ··· 46 38 sizeof(struct xfs_attr3_rmt_hdr) : 0)) 47 39 48 40 extern const struct xfs_buf_ops xfs_attr3_rmt_buf_ops; 41 + 42 + int xfs_attr3_rmt_blocks(struct xfs_mount *mp, int attrlen); 49 43 50 44 int xfs_attr_rmtval_get(struct xfs_da_args *args); 51 45 int xfs_attr_rmtval_set(struct xfs_da_args *args);
+1
fs/xfs/xfs_buf.c
··· 513 513 xfs_alert(btp->bt_mount, 514 514 "%s: Block out of range: block 0x%llx, EOFS 0x%llx ", 515 515 __func__, blkno, eofs); 516 + WARN_ON(1); 516 517 return NULL; 517 518 } 518 519
+1 -6
fs/xfs/xfs_buf_item.c
··· 262 262 vecp->i_addr = xfs_buf_offset(bp, buffer_offset); 263 263 vecp->i_len = nbits * XFS_BLF_CHUNK; 264 264 vecp->i_type = XLOG_REG_TYPE_BCHUNK; 265 - /* 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 - */ 265 + nvecs++; 271 266 vecp++; 272 267 first_bit = next_bit; 273 268 last_bit = next_bit;
+8
fs/xfs/xfs_dfrag.c
··· 219 219 int taforkblks = 0; 220 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 230 tempifp = kmem_alloc(sizeof(xfs_ifork_t), KM_MAYFAIL); 223 231 if (!tempifp) { 224 232 error = XFS_ERROR(ENOMEM);
+1
fs/xfs/xfs_dir2_format.h
··· 715 715 __be32 firstdb; /* db of first entry */ 716 716 __be32 nvalid; /* count of valid entries */ 717 717 __be32 nused; /* count of used entries */ 718 + __be32 pad; /* 64 bit alignment. */ 718 719 }; 719 720 720 721 struct xfs_dir3_free {
+6 -7
fs/xfs/xfs_dir2_node.c
··· 263 263 * Initialize the new block to be empty, and remember 264 264 * its first slot as our empty slot. 265 265 */ 266 - hdr.magic = XFS_DIR2_FREE_MAGIC; 267 - hdr.firstdb = 0; 268 - hdr.nused = 0; 269 - hdr.nvalid = 0; 266 + memset(bp->b_addr, 0, sizeof(struct xfs_dir3_free_hdr)); 267 + memset(&hdr, 0, sizeof(hdr)); 268 + 270 269 if (xfs_sb_version_hascrc(&mp->m_sb)) { 271 270 struct xfs_dir3_free_hdr *hdr3 = bp->b_addr; 272 271 273 272 hdr.magic = XFS_DIR3_FREE_MAGIC; 273 + 274 274 hdr3->hdr.blkno = cpu_to_be64(bp->b_bn); 275 275 hdr3->hdr.owner = cpu_to_be64(dp->i_ino); 276 276 uuid_copy(&hdr3->hdr.uuid, &mp->m_sb.sb_uuid); 277 - } 277 + } else 278 + hdr.magic = XFS_DIR2_FREE_MAGIC; 278 279 xfs_dir3_free_hdr_to_disk(bp->b_addr, &hdr); 279 280 *bpp = bp; 280 281 return 0; ··· 1922 1921 */ 1923 1922 freehdr.firstdb = (fbno - XFS_DIR2_FREE_FIRSTDB(mp)) * 1924 1923 xfs_dir3_free_max_bests(mp); 1925 - free->hdr.nvalid = 0; 1926 - free->hdr.nused = 0; 1927 1924 } else { 1928 1925 free = fbp->b_addr; 1929 1926 bests = xfs_dir3_free_bests_p(mp, free);
+1
fs/xfs/xfs_fs.h
··· 236 236 #define XFS_FSOP_GEOM_FLAGS_PROJID32 0x0800 /* 32-bit project IDs */ 237 237 #define XFS_FSOP_GEOM_FLAGS_DIRV2CI 0x1000 /* ASCII only CI names */ 238 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 /*
+3 -1
fs/xfs/xfs_fsops.c
··· 99 99 (xfs_sb_version_hasattr2(&mp->m_sb) ? 100 100 XFS_FSOP_GEOM_FLAGS_ATTR2 : 0) | 101 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 105 geo->logsectsize = xfs_sb_version_hassector(&mp->m_sb) ? 104 106 mp->m_sb.sb_logsectsize : BBSIZE; 105 107 geo->rtsectsize = mp->m_sb.sb_blocksize;
+32 -15
fs/xfs/xfs_iops.c
··· 455 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 480 int 459 481 xfs_setattr_nonsize( 460 482 struct xfs_inode *ip, ··· 628 606 /* 629 607 * Change file access modes. 630 608 */ 631 - if (mask & ATTR_MODE) { 632 - umode_t mode = iattr->ia_mode; 633 - 634 - if (!in_group_p(inode->i_gid) && !capable(CAP_FSETID)) 635 - mode &= ~S_ISGID; 636 - 637 - ip->i_d.di_mode &= S_IFMT; 638 - ip->i_d.di_mode |= mode & ~S_IFMT; 639 - 640 - inode->i_mode &= S_IFMT; 641 - inode->i_mode |= mode & ~S_IFMT; 642 - } 609 + if (mask & ATTR_MODE) 610 + xfs_setattr_mode(tp, ip, iattr); 643 611 644 612 /* 645 613 * Change file access or modified times. ··· 726 714 return XFS_ERROR(error); 727 715 728 716 ASSERT(S_ISREG(ip->i_d.di_mode)); 729 - ASSERT((mask & (ATTR_MODE|ATTR_UID|ATTR_GID|ATTR_ATIME|ATTR_ATIME_SET| 730 - ATTR_MTIME_SET|ATTR_KILL_SUID|ATTR_KILL_SGID| 731 - ATTR_KILL_PRIV|ATTR_TIMES_SET)) == 0); 717 + ASSERT((mask & (ATTR_UID|ATTR_GID|ATTR_ATIME|ATTR_ATIME_SET| 718 + ATTR_MTIME_SET|ATTR_KILL_PRIV|ATTR_TIMES_SET)) == 0); 732 719 733 720 if (!(flags & XFS_ATTR_NOLOCK)) { 734 721 lock_flags |= XFS_IOLOCK_EXCL; ··· 870 859 /* A truncate down always removes post-EOF blocks. */ 871 860 xfs_inode_clear_eofblocks_tag(ip); 872 861 } 862 + 863 + /* 864 + * Change file access modes. 865 + */ 866 + if (mask & ATTR_MODE) 867 + xfs_setattr_mode(tp, ip, iattr); 873 868 874 869 if (mask & ATTR_CTIME) { 875 870 inode->i_ctime = iattr->ia_ctime;
+11
fs/xfs/xfs_log_recover.c
··· 2097 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 2111 * Do a sanity check if this is a dquot buffer. Just checking 2101 2112 * the first dquot in the buffer should do. XXXThis is 2102 2113 * probably a good thing to do for other buf types also.
+26 -20
fs/xfs/xfs_qm_syscalls.c
··· 489 489 if ((newlim->d_fieldmask & XFS_DQ_MASK) == 0) 490 490 return 0; 491 491 492 + /* 493 + * We don't want to race with a quotaoff so take the quotaoff lock. 494 + * We don't hold an inode lock, so there's nothing else to stop 495 + * a quotaoff from happening. 496 + */ 497 + mutex_lock(&q->qi_quotaofflock); 498 + 499 + /* 500 + * Get the dquot (locked) before we start, as we need to do a 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. 505 + */ 506 + error = xfs_qm_dqget(mp, NULL, id, type, XFS_QMOPT_DQALLOC, &dqp); 507 + if (error) { 508 + ASSERT(error != ENOENT); 509 + goto out_unlock; 510 + } 511 + xfs_dqunlock(dqp); 512 + 492 513 tp = xfs_trans_alloc(mp, XFS_TRANS_QM_SETQLIM); 493 514 error = xfs_trans_reserve(tp, 0, XFS_QM_SETQLIM_LOG_RES(mp), 494 515 0, 0, XFS_DEFAULT_LOG_COUNT); 495 516 if (error) { 496 517 xfs_trans_cancel(tp, 0); 497 - return (error); 518 + goto out_rele; 498 519 } 499 520 500 - /* 501 - * 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 503 - * a quotaoff from happening). (XXXThis doesn't currently happen 504 - * because we take the vfslock before calling xfs_qm_sysent). 505 - */ 506 - mutex_lock(&q->qi_quotaofflock); 507 - 508 - /* 509 - * Get the dquot (locked), and join it to the transaction. 510 - * Allocate the dquot if this doesn't exist. 511 - */ 512 - if ((error = xfs_qm_dqget(mp, NULL, id, type, XFS_QMOPT_DQALLOC, &dqp))) { 513 - xfs_trans_cancel(tp, XFS_TRANS_ABORT); 514 - ASSERT(error != ENOENT); 515 - goto out_unlock; 516 - } 521 + xfs_dqlock(dqp); 517 522 xfs_trans_dqjoin(tp, dqp); 518 523 ddq = &dqp->q_core; 519 524 ··· 626 621 xfs_trans_log_dquot(tp, dqp); 627 622 628 623 error = xfs_trans_commit(tp, 0); 629 - xfs_qm_dqrele(dqp); 630 624 631 - out_unlock: 625 + out_rele: 626 + xfs_qm_dqrele(dqp); 627 + out_unlock: 632 628 mutex_unlock(&q->qi_quotaofflock); 633 629 return error; 634 630 }
+6 -14
fs/xfs/xfs_symlink.c
··· 56 56 struct xfs_mount *mp, 57 57 int pathlen) 58 58 { 59 - int fsblocks = 0; 60 - int len = pathlen; 59 + int buflen = XFS_SYMLINK_BUF_SPACE(mp, mp->m_sb.sb_blocksize); 61 60 62 - do { 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; 61 + return (pathlen + buflen - 1) / buflen; 69 62 } 70 63 71 64 static int ··· 398 405 if (pathlen <= XFS_LITINO(mp, dp->i_d.di_version)) 399 406 fs_blocks = 0; 400 407 else 401 - fs_blocks = XFS_B_TO_FSB(mp, pathlen); 408 + fs_blocks = xfs_symlink_blocks(mp, pathlen); 402 409 resblks = XFS_SYMLINK_SPACE_RES(mp, link_name->len, fs_blocks); 403 410 error = xfs_trans_reserve(tp, resblks, XFS_SYMLINK_LOG_RES(mp), 0, 404 411 XFS_TRANS_PERM_LOG_RES, XFS_SYMLINK_LOG_COUNT); ··· 505 512 cur_chunk = target_path; 506 513 offset = 0; 507 514 for (n = 0; n < nmaps; n++) { 508 - char *buf; 515 + char *buf; 509 516 510 517 d = XFS_FSB_TO_DADDR(mp, mval[n].br_startblock); 511 518 byte_cnt = XFS_FSB_TO_B(mp, mval[n].br_blockcount); ··· 518 525 bp->b_ops = &xfs_symlink_buf_ops; 519 526 520 527 byte_cnt = XFS_SYMLINK_BUF_SPACE(mp, byte_cnt); 521 - if (pathlen < byte_cnt) { 522 - byte_cnt = pathlen; 523 - } 528 + byte_cnt = min(byte_cnt, pathlen); 524 529 525 530 buf = bp->b_addr; 526 531 buf += xfs_symlink_hdr_set(mp, ip->i_ino, offset, ··· 533 542 xfs_trans_log_buf(tp, bp, 0, (buf + byte_cnt - 1) - 534 543 (char *)bp->b_addr); 535 544 } 545 + ASSERT(pathlen == 0); 536 546 } 537 547 538 548 /*
+3 -2
include/linux/aer.h
··· 49 49 } 50 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 53 int cper_severity, struct aer_capability_regs *aer); 54 54 extern int cper_severity_to_aer(int cper_severity); 55 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 58 #endif //_AER_H_ 58 59
+1
include/target/target_core_base.h
··· 543 543 struct list_head sess_list; 544 544 struct list_head sess_acl_list; 545 545 struct list_head sess_cmd_list; 546 + struct list_head sess_wait_list; 546 547 spinlock_t sess_cmd_lock; 547 548 struct kref sess_kref; 548 549 };
+2 -2
include/target/target_core_fabric.h
··· 114 114 115 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 119 bool transport_wait_for_tasks(struct se_cmd *); 120 120 int transport_check_aborted_status(struct se_cmd *, int); ··· 123 123 int target_get_sess_cmd(struct se_session *, struct se_cmd *, bool); 124 124 int target_put_sess_cmd(struct se_session *, struct se_cmd *); 125 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 128 int core_alua_check_nonop_delay(struct se_cmd *); 129 129
+1
include/video/omapdss.h
··· 748 748 }; 749 749 750 750 enum omapdss_version omapdss_get_version(void); 751 + bool omapdss_is_initialized(void); 751 752 752 753 int omap_dss_register_driver(struct omap_dss_driver *); 753 754 void omap_dss_unregister_driver(struct omap_dss_driver *);
+1
include/xen/xenbus.h
··· 70 70 struct device dev; 71 71 enum xenbus_state state; 72 72 struct completion down; 73 + struct work_struct work; 73 74 }; 74 75 75 76 static inline struct xenbus_device *to_xenbus_device(struct device *dev)
+5 -3
kernel/range.c
··· 48 48 final_start = min(range[i].start, start); 49 49 final_end = max(range[i].end, end); 50 50 51 - range[i].start = final_start; 52 - range[i].end = final_end; 53 - return nr_range; 51 + /* clear it and add it back for further merge */ 52 + range[i].start = 0; 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 58 /* Need to add it: */
+3
kernel/trace/ring_buffer.c
··· 620 620 if (cpu == RING_BUFFER_ALL_CPUS) 621 621 work = &buffer->irq_work; 622 622 else { 623 + if (!cpumask_test_cpu(cpu, buffer->cpumask)) 624 + return -EINVAL; 625 + 623 626 cpu_buffer = buffer->buffers[cpu]; 624 627 work = &cpu_buffer->irq_work; 625 628 }
+7 -2
kernel/trace/trace.c
··· 6216 6216 6217 6217 trace_init_cmdlines(); 6218 6218 6219 - register_tracer(&nop_trace); 6220 - 6219 + /* 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 6224 global_trace.current_trace = &nop_trace; 6225 + 6226 + register_tracer(&nop_trace); 6222 6227 6223 6228 /* All seems OK, enable tracing */ 6224 6229 tracing_disabled = 0;
+5 -3
net/sunrpc/auth_gss/svcauth_gss.c
··· 1287 1287 1288 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 1292 struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); 1293 1293 int ret = 0; ··· 1317 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 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 1326 return wait_event_interruptible(sn->gssp_wq, gssp_ready(sn)); 1325 1327 } 1326 1328 ··· 1364 1362 size_t len; 1365 1363 int ret; 1366 1364 1367 - ret = wait_for_gss_proxy(net); 1365 + ret = wait_for_gss_proxy(net, file); 1368 1366 if (ret) 1369 1367 return ret; 1370 1368
+7 -5
net/sunrpc/svcauth_unix.c
··· 810 810 goto badcred; 811 811 argv->iov_base = (void*)((__be32*)argv->iov_base + slen); /* skip machname */ 812 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 820 cred->cr_uid = make_kuid(&init_user_ns, svc_getnl(argv)); /* uid */ 815 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 822 slen = svc_getnl(argv); /* gids length */ 819 823 if (slen > 16 || (len -= (slen + 2)*4) < 0) 820 824 goto badcred; ··· 827 823 return SVC_CLOSE; 828 824 for (i = 0; i < slen; i++) { 829 825 kgid_t kgid = make_kgid(&init_user_ns, svc_getnl(argv)); 830 - if (!gid_valid(kgid)) 831 - goto badcred; 832 826 GROUP_AT(cred->cr_group_info, i) = kgid; 833 827 } 834 828 if (svc_getu32(argv) != htonl(RPC_AUTH_NULL) || svc_getu32(argv) != 0) {
+4 -4
sound/soc/codecs/cs42l52.c
··· 86 86 { CS42L52_BEEP_VOL, 0x00 }, /* r1D Beep Volume off Time */ 87 87 { CS42L52_BEEP_TONE_CTL, 0x00 }, /* r1E Beep Tone Cfg. */ 88 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 90 { CS42L52_MASTERB_VOL, 0x00 }, /* r21 Master B Volume */ 91 91 { CS42L52_HPA_VOL, 0x00 }, /* r22 Headphone A Volume */ 92 92 { CS42L52_HPB_VOL, 0x00 }, /* r23 Headphone B Volume */ ··· 225 225 }; 226 226 227 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 229 ARRAY_SIZE(mic_bias_level_text), mic_bias_level_text); 230 230 231 231 static const char * const cs42l52_mic_text[] = { "Single", "Differential" }; ··· 413 413 SOC_ENUM("Headphone Analog Gain", hp_gain_enum), 414 414 415 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 418 SOC_DOUBLE_R_SX_TLV("Bypass Volume", CS42L52_PASSTHRUA_VOL, 419 419 CS42L52_PASSTHRUB_VOL, 6, 0x18, 0x90, pga_tlv), ··· 441 441 442 442 SOC_DOUBLE_R_SX_TLV("PCM Mixer Volume", 443 443 CS42L52_PCMA_MIXER_VOL, CS42L52_PCMB_MIXER_VOL, 444 - 6, 0x7f, 0x19, hl_tlv), 444 + 0, 0x7f, 0x19, hl_tlv), 445 445 SOC_DOUBLE_R("PCM Mixer Switch", 446 446 CS42L52_PCMA_MIXER_VOL, CS42L52_PCMB_MIXER_VOL, 7, 1, 1), 447 447
+1 -1
sound/soc/codecs/cs42l52.h
··· 157 157 #define CS42L52_PB_CTL1_INV_PCMA (1 << 2) 158 158 #define CS42L52_PB_CTL1_MSTB_MUTE (1 << 1) 159 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 161 #define CS42L52_PB_CTL1_MUTE 3 162 162 #define CS42L52_PB_CTL1_UNMUTE 0 163 163
+1 -1
sound/soc/codecs/max98090.c
··· 2233 2233 dev_dbg(codec->dev, "irq = %d\n", max98090->irq); 2234 2234 2235 2235 ret = request_threaded_irq(max98090->irq, NULL, 2236 - max98090_interrupt, IRQF_TRIGGER_FALLING, 2236 + max98090_interrupt, IRQF_TRIGGER_FALLING | IRQF_ONESHOT, 2237 2237 "max98090_interrupt", codec); 2238 2238 if (ret < 0) { 2239 2239 dev_err(codec->dev, "request_irq failed: %d\n",
+3 -1
sound/soc/codecs/wm5110.c
··· 190 190 ARIZONA_MIXER_CONTROLS("DSP3L", ARIZONA_DSP3LMIX_INPUT_1_SOURCE), 191 191 ARIZONA_MIXER_CONTROLS("DSP3R", ARIZONA_DSP3RMIX_INPUT_1_SOURCE), 192 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 195 ARIZONA_MIXER_CONTROLS("Mic", ARIZONA_MICMIX_INPUT_1_SOURCE), 196 196 ARIZONA_MIXER_CONTROLS("Noise", ARIZONA_NOISEMIX_INPUT_1_SOURCE), ··· 975 975 ret = snd_soc_codec_set_cache_io(codec, 32, 16, SND_SOC_REGMAP); 976 976 if (ret != 0) 977 977 return ret; 978 + 979 + arizona_init_spk(codec); 978 980 979 981 snd_soc_dapm_disable_pin(&codec->dapm, "HAPTICS"); 980 982
+11 -1
sound/soc/codecs/wm8994.c
··· 383 383 struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); 384 384 int drc = wm8994_get_drc(kcontrol->id.name); 385 385 386 + if (drc < 0) 387 + return drc; 386 388 ucontrol->value.enumerated.item[0] = wm8994->drc_cfg[drc]; 387 389 388 390 return 0; ··· 489 487 struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); 490 488 struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); 491 489 int block = wm8994_get_retune_mobile_block(kcontrol->id.name); 490 + 491 + if (block < 0) 492 + return block; 492 493 493 494 ucontrol->value.enumerated.item[0] = wm8994->retune_mobile_cfg[block]; 494 495 ··· 1036 1031 { 1037 1032 struct snd_soc_codec *codec = w->codec; 1038 1033 struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); 1039 - struct wm8994 *control = codec->control_data; 1034 + struct wm8994 *control = wm8994->wm8994; 1040 1035 int mask = WM8994_AIF1DAC1L_ENA | WM8994_AIF1DAC1R_ENA; 1041 1036 int i; 1042 1037 int dac; ··· 3838 3833 dev_dbg(codec->dev, "Ignoring removed jack\n"); 3839 3834 return IRQ_HANDLED; 3840 3835 } 3836 + } else if (!(reg & WM8958_MICD_STS)) { 3837 + snd_soc_jack_report(wm8994->micdet[0].jack, 0, 3838 + SND_JACK_MECHANICAL | SND_JACK_HEADSET | 3839 + wm8994->btn_mask); 3840 + goto out; 3841 3841 } 3842 3842 3843 3843 if (wm8994->mic_detecting)
+4 -3
sound/soc/davinci/davinci-mcasp.c
··· 631 631 int word_length) 632 632 { 633 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 636 u32 mask = (1ULL << word_length) - 1; 636 637 637 638 /* ··· 656 655 mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, 657 656 TXSSZ(fmt), TXSSZ(0x0F)); 658 657 mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, 659 - TXROT(rotate), TXROT(7)); 658 + TXROT(tx_rotate), TXROT(7)); 660 659 mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, 661 - RXROT(rotate), RXROT(7)); 660 + RXROT(rx_rotate), RXROT(7)); 662 661 mcasp_set_reg(dev->base + DAVINCI_MCASP_RXMASK_REG, 663 662 mask); 664 663 }
+6 -2
sound/soc/soc-compress.c
··· 220 220 goto err; 221 221 } 222 222 223 - snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK, 224 - SND_SOC_DAPM_STREAM_START); 223 + if (cstream->direction == SND_COMPRESS_PLAYBACK) 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 230 /* cancel any delayed stream shutdown that is pending */ 227 231 rtd->pop_wait = 0;
+3 -3
sound/usb/6fire/firmware.c
··· 42 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] = { 46 - { 0x03, 0x01, 0x0b, 0x00 } 45 + static const u8 known_fw_versions[][2] = { 46 + { 0x03, 0x01 } 47 47 }; 48 48 49 49 struct ihex_record { ··· 343 343 int i; 344 344 345 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 347 return 0; 348 348 349 349 snd_printk(KERN_ERR PREFIX "invalid fimware version in device: %*ph. "