diff -ur a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S --- a/arch/arm/kernel/calls.S 2016-04-25 01:12:06.000000000 +0200 +++ b/arch/arm/kernel/calls.S 2017-03-23 12:58:54.000000000 +0100 @@ -477,7 +477,7 @@ CALL(sys_ni_syscall) CALL(sys_ni_syscall) #endif /* MY_ABC_HERE */ -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE CALL(sys_SYNONotifyInit) /* 422 */ CALL(sys_SYNONotifyAddWatch) /* 423 */ CALL(sys_SYNONotifyRemoveWatch) /* 424 */ @@ -489,7 +489,7 @@ CALL(sys_ni_syscall) CALL(sys_ni_syscall) CALL(sys_ni_syscall) -#endif /* CONFIG_SYNO_NOTIFY */ +#endif /* MY_ABC_HERE */ #ifdef MY_ABC_HERE CALL(sys_SYNOArchiveOverwrite) /* 427 */ #else diff -ur a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c --- a/arch/arm/kernel/setup.c 2016-04-25 01:12:07.000000000 +0200 +++ b/arch/arm/kernel/setup.c 2017-03-23 12:58:57.000000000 +0100 @@ -65,7 +65,7 @@ #include "atags.h" #include "tcm.h" -#ifdef CONFIG_SYNO_FACTORY_USB3_DISABLE +#ifdef MY_ABC_HERE extern int gSynoFactoryUSB3Disable; #endif @@ -96,12 +96,12 @@ extern long g_hdd_hotplug; #endif -#ifdef CONFIG_SYNO_MAC_ADDRESS +#ifdef MY_ABC_HERE extern unsigned char grgbLanMac[CONFIG_SYNO_MAC_IF][16]; extern int giVenderFormatVersion; #endif -#ifdef CONFIG_SYNO_SERIAL +#ifdef MY_ABC_HERE extern char gszSerialNum[32]; extern char gszCustomSerialNum[32]; #endif @@ -285,7 +285,7 @@ __setup("HddHotplug=", early_hdd_hotplug); #endif -#ifdef CONFIG_SYNO_MAC_ADDRESS +#ifdef MY_ABC_HERE static int __init early_mac1(char *p) { #if CONFIG_SYNO_MAC_IF > 1 @@ -364,9 +364,9 @@ return 1; } __setup("vender_format_version=", early_vender_format_version); -#endif /* CONFIG_SYNO_MAC_ADDRESS */ +#endif /* MY_ABC_HERE */ -#ifdef CONFIG_SYNO_SERIAL +#ifdef MY_ABC_HERE static int __init early_sn(char *p) { snprintf(gszSerialNum, sizeof(gszSerialNum), "%s", p); @@ -465,7 +465,7 @@ __setup("syno_usb_fast_reset=", early_factory_usb_fast_reset); #endif -#ifdef CONFIG_SYNO_FACTORY_USB3_DISABLE +#ifdef MY_ABC_HERE static int __init early_factory_usb3_disable(char *p) { gSynoFactoryUSB3Disable = simple_strtol(p, NULL, 10); diff -ur a/arch/arm/mach-hi3535/core.c b/arch/arm/mach-hi3535/core.c --- a/arch/arm/mach-hi3535/core.c 2016-04-25 01:13:08.000000000 +0200 +++ b/arch/arm/mach-hi3535/core.c 2017-03-23 13:01:04.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif #include #include #include @@ -36,7 +39,7 @@ #include #include -#if defined(CONFIG_SYNO_HI3535_NVR) +#if defined(MY_ABC_HERE) #define UART1_REG(x) (IO_ADDRESS(REG_BASE_UART1) + ((UART_##x) << 2)) #define SET8N1 0x3 #define SOFTWARE_SHUTDOWN 0x31 @@ -48,7 +51,7 @@ writel(SET8N1, UART1_REG(LCR)); writel(SOFTWARE_SHUTDOWN, UART1_REG(TX)); } -#endif /* CONFIG_SYNO_HI3535_NVR */ +#endif /* MY_ABC_HERE */ /*#define HW_REG(a) (*(volatile unsigned int *)(a))*/ #define HW_REG(a) readl(a) @@ -198,10 +201,10 @@ amba_device_register(amba_devs[i], &iomem_resource); } -#if defined(CONFIG_SYNO_HI3535_NVR) +#if defined(MY_ABC_HERE) pm_power_off = synology_power_off; synology_gpio_init(); -#endif /* CONFIG_SYNO_HI3535_NVR */ +#endif /* MY_ABC_HERE */ } /*****************************************************************************/ @@ -282,11 +285,11 @@ void hi3535_restart(char mode, const char *cmd) { -#if defined(CONFIG_SYNO_HI3535_NVR) +#if defined(MY_ABC_HERE) writel(SET8N1, UART1_REG(LCR)); writel(SOFTWARE_REBOOT, UART1_REG(TX)); msleep(5); -#endif /* CONFIG_SYNO_HI3535_NVR */ +#endif /* MY_ABC_HERE */ __raw_writel(~0, IO_ADDRESS(SYS_CTRL_BASE) + REG_SC_SYSRES); } diff -ur a/arch/arm/mach-hi3535/synology-gpio.c b/arch/arm/mach-hi3535/synology-gpio.c --- a/arch/arm/mach-hi3535/synology-gpio.c 2016-04-25 01:13:08.000000000 +0200 +++ b/arch/arm/mach-hi3535/synology-gpio.c 2017-03-23 13:01:05.000000000 +0100 @@ -437,7 +437,7 @@ void synology_gpio_init(void) { -#if defined(CONFIG_SYNO_HI3535_NVR) +#if defined(MY_ABC_HERE) Hii3535_nvr216_gpio_init(&generic_gpio); printk("Synology HI3535 NVR216 GPIO Init\n"); #else diff -ur a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c --- a/drivers/ata/ahci_platform.c 2016-04-25 01:33:45.000000000 +0200 +++ b/drivers/ata/ahci_platform.c 2017-03-23 13:39:03.000000000 +0100 @@ -356,9 +356,9 @@ if (shost->hostt->syno_host_poweroff_task) { shost->hostt->syno_host_poweroff_task(shost); } -#ifdef CONFIG_SYNO_X64 +#ifdef MY_DEF_HERE syno_pulldown_eunit_gpio(host->ports[i]); -#endif /* CONFIG_SYNO_X64 */ +#endif /* MY_DEF_HERE */ } } diff -ur a/drivers/ata/libahci.c b/drivers/ata/libahci.c --- a/drivers/ata/libahci.c 2016-04-25 01:33:53.000000000 +0200 +++ b/drivers/ata/libahci.c 2017-03-23 13:39:14.000000000 +0100 @@ -47,7 +47,7 @@ #include #include #include -#ifdef CONFIG_SYNO_HI3535_NVR +#ifdef MY_ABC_HERE #include "libata.h" #endif #include "ahci.h" @@ -56,16 +56,16 @@ #endif #include "hisatav200.h" -#ifdef CONFIG_SYNO_LEDS_TRIGGER +#ifdef MY_ABC_HERE #include -#endif /* CONFIG_SYNO_LEDS_TRIGGER */ +#endif /* MY_ABC_HERE */ -#ifdef CONFIG_SYNO_LEDS_TRIGGER +#ifdef MY_ABC_HERE extern void syno_ledtrig_active_set(int iLedNum); extern int *gpGreenLedMap; #else extern int SYNO_CTRL_HDD_ACT_NOTIFY(int index); -#endif /* CONFIG_SYNO_LEDS_TRIGGER */ +#endif /* MY_ABC_HERE */ static int ahci_skip_host_reset; int ahci_ignore_sss; @@ -248,7 +248,7 @@ .em_store = ahci_led_store, .sw_activity_show = ahci_activity_show, .sw_activity_store = ahci_activity_store, -#ifdef CONFIG_SYNO_HI3535_NVR +#ifdef MY_ABC_HERE .transmit_led_message = ahci_transmit_led_message, #endif #ifdef CONFIG_PM @@ -818,17 +818,17 @@ } #endif -#if defined(CONFIG_ARCH_GEN3) || defined(CONFIG_SYNO_AVOTON) || defined(CONFIG_SYNO_ALPINE) || defined(CONFIG_SYNO_HI3535_NVR) +#if defined(CONFIG_ARCH_GEN3) || defined(MY_DEF_HERE) || defined(MY_DEF_HERE) || defined(MY_ABC_HERE) static void syno_sw_activity(struct ata_port *ap) { -#ifdef CONFIG_SYNO_LEDS_TRIGGER +#ifdef MY_ABC_HERE if(NULL == gpGreenLedMap){ return; } syno_ledtrig_active_set(gpGreenLedMap[ap->syno_disk_index]); -#else /* CONFIG_SYNO_LEDS_TRIGGER */ +#else /* MY_ABC_HERE */ SYNO_CTRL_HDD_ACT_NOTIFY(ap->syno_disk_index); -#endif /* CONFIG_SYNO_LEDS_TRIGGER */ +#endif /* MY_ABC_HERE */ } /** @@ -909,7 +909,7 @@ /* EM Transmit bit maybe busy during init */ for (i = 0; i < EM_MAX_RETRY; i++) { -#ifdef CONFIG_SYNO_HI3535_NVR +#ifdef MY_ABC_HERE rc = ap->ops->transmit_led_message(ap, emp->led_state, 4); @@ -1032,7 +1032,7 @@ * toggle state of LED and reset timer. If not, * turn LED to desired idle state. */ -#if defined(CONFIG_SYNO_HI3535_SW_SATA_LED) +#if defined(MY_ABC_HERE) spin_lock_irqsave(ap->lock, flags); if (emp->saved_activity != emp->activity) { emp->saved_activity = emp->activity; @@ -1063,18 +1063,18 @@ } else { /* switch to idle */ led_message &= ~EM_MSG_LED_VALUE_ACTIVITY; -#ifdef CONFIG_SYNO_HI3535_NVR +#ifdef MY_ABC_HERE if ((ata_phys_link_online(link)) || (emp->blink_policy == BLINK_OFF)) #else if (emp->blink_policy == BLINK_OFF) #endif led_message |= (1 << 16); -#ifdef CONFIG_SYNO_HI3535_NVR +#ifdef MY_ABC_HERE mod_timer(&emp->timer, jiffies + msecs_to_jiffies(500)); #endif } spin_unlock_irqrestore(ap->lock, flags); -#ifdef CONFIG_SYNO_HI3535_NVR +#ifdef MY_ABC_HERE ap->ops->transmit_led_message(ap, led_message, 4); #else ahci_transmit_led_message(ap, led_message, 4); @@ -1090,12 +1090,12 @@ /* init activity stats, setup timer */ emp->saved_activity = emp->activity = 0; -#if defined(CONFIG_SYNO_HI3535_NVR) && !defined(CONFIG_SYNO_HI3535_SW_SATA_LED) +#if defined(MY_ABC_HERE) && !defined(MY_ABC_HERE) emp->blink_policy = BLINK_ON; #endif setup_timer(&emp->timer, ahci_sw_activity_blink, (unsigned long)link); -#if defined(CONFIG_SYNO_HI3535_SW_SATA_LED) +#if defined(MY_ABC_HERE) #else /* check our blink policy and set flag for link if it's enabled */ if (emp->blink_policy) @@ -1214,7 +1214,7 @@ if (emp->blink_policy) state &= ~EM_MSG_LED_VALUE_ACTIVITY; -#ifdef CONFIG_SYNO_HI3535_NVR +#ifdef MY_ABC_HERE return ap->ops->transmit_led_message(ap, state, size); #else return ahci_transmit_led_message(ap, state, size); @@ -1237,7 +1237,7 @@ /* set the LED to OFF */ port_led_state &= EM_MSG_LED_VALUE_OFF; port_led_state |= (ap->port_no | (link->pmp << 8)); -#ifdef CONFIG_SYNO_HI3535_NVR +#ifdef MY_ABC_HERE ap->ops->transmit_led_message(ap, port_led_state, 4); #else ahci_transmit_led_message(ap, port_led_state, 4); @@ -1249,7 +1249,7 @@ port_led_state &= EM_MSG_LED_VALUE_OFF; port_led_state |= (ap->port_no | (link->pmp << 8)); port_led_state |= EM_MSG_LED_VALUE_ON; /* check this */ -#ifdef CONFIG_SYNO_HI3535_NVR +#ifdef MY_ABC_HERE ap->ops->transmit_led_message(ap, port_led_state, 4); #else ahci_transmit_led_message(ap, port_led_state, 4); diff -ur a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c --- a/drivers/ata/libata-core.c 2016-04-25 01:33:51.000000000 +0200 +++ b/drivers/ata/libata-core.c 2017-03-23 13:39:18.000000000 +0100 @@ -6390,7 +6390,7 @@ goto END; } -#if defined(CONFIG_SYNO_HI3535_NVR) +#if defined(MY_ABC_HERE) if (SYNOHI3535IsBoardNeedPowerUpHDD(pAp->print_id)) { SYNO_CTRL_HDD_POWERON(pAp->print_id, 1); if (0 == SYNO_CHECK_HDD_PRESENT(pAp->print_id)) { diff -ur a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c --- a/drivers/ata/libata-eh.c 2016-04-25 01:33:54.000000000 +0200 +++ b/drivers/ata/libata-eh.c 2017-03-23 13:39:17.000000000 +0100 @@ -4458,9 +4458,9 @@ struct ata_device *dev; int rc, nr_fails; unsigned long flags, deadline; -#ifdef CONFIG_SYNO_FORCE_EH_FULL_RECOVER_RETRY +#ifdef MY_ABC_HERE bool blCleanFlags = 0; -#endif /* CONFIG_SYNO_FORCE_EH_FULL_RECOVER_RETRY */ +#endif /* MY_ABC_HERE */ DPRINTK("ENTER\n"); @@ -4553,11 +4553,11 @@ } } #endif -#ifdef CONFIG_SYNO_FORCE_EH_FULL_RECOVER_RETRY +#ifdef MY_ABC_HERE if (sata_pmp_attached(ap)){ blCleanFlags = 1; } -#endif /* CONFIG_SYNO_FORCE_EH_FULL_RECOVER_RETRY */ +#endif /* MY_ABC_HERE */ goto out; } } @@ -4710,7 +4710,7 @@ /* PMP reset requires working host port. * Can't retry if it's frozen. */ -#ifdef CONFIG_SYNO_FORCE_EH_FULL_RECOVER_RETRY +#ifdef MY_ABC_HERE if (sata_pmp_attached(ap)){ blCleanFlags = 1; goto out; @@ -4730,14 +4730,14 @@ if (rc && r_failed_link) *r_failed_link = link; -#ifdef CONFIG_SYNO_FORCE_EH_FULL_RECOVER_RETRY +#ifdef MY_ABC_HERE if (blCleanFlags){ ata_for_each_link(link, ap, PMP_FIRST){ struct ata_eh_context *ehc = &link->eh_context; ehc->i.flags = 0; } } -#endif /* CONFIG_SYNO_FORCE_EH_FULL_RECOVER_RETRY */ +#endif /* MY_ABC_HERE */ #ifdef MY_ABC_HERE /* if not pmp, set link flags to ata port flags for ata port error handling. diff -ur a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c --- a/drivers/ata/libata-pmp.c 2016-04-25 01:33:51.000000000 +0200 +++ b/drivers/ata/libata-pmp.c 2017-03-23 13:39:12.000000000 +0100 @@ -1089,7 +1089,7 @@ syno_libata_pm_zero_watt_poweron(struct ata_port *pAp) { int iRet = -1; -#if defined(CONFIG_SYNO_X64) +#if defined(MY_DEF_HERE) int iValue = 0; int iPin = -1; diff -ur a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c --- a/drivers/ata/libata-scsi.c 2016-04-25 01:33:51.000000000 +0200 +++ b/drivers/ata/libata-scsi.c 2017-03-23 13:39:18.000000000 +0100 @@ -77,13 +77,13 @@ #endif #if defined(MY_ABC_HERE) -#if defined(CONFIG_SYNO_MV88F6281) +#if defined(MY_DEF_HERE) extern unsigned char SYNOKirkwoodIsBoardNeedPowerUpHDD(u32); extern int SYNO_CTRL_HDD_POWERON(int index, int value); -#elif defined(CONFIG_SYNO_X64) +#elif defined(MY_DEF_HERE) extern unsigned char SYNOX64IsSupportHDDPowerCtrl(void); extern int SYNO_CTRL_HDD_POWERON(int index, int value); -#elif defined(CONFIG_SYNO_ARMADA) || defined(CONFIG_SYNO_ARMADA_V2) +#elif defined(MY_DEF_HERE) || defined(MY_DEF_HERE) extern unsigned char SYNOArmadaIsBoardNeedPowerUpHDD(u32); extern int SYNO_CTRL_HDD_POWERON(int index, int value); #elif defined(CONFIG_ARCH_GEN3) @@ -92,10 +92,10 @@ #elif defined(CONFIG_ARCH_COMCERTO) extern unsigned char SYNOComcerto2kIsBoardNeedPowerUpHDD(u32); extern int SYNO_CTRL_HDD_POWERON(int index, int value); -#elif defined(CONFIG_SYNO_ALPINE) +#elif defined(MY_DEF_HERE) extern unsigned char SYNOALPINEIsBoardNeedPowerUpHDD(u32); extern int SYNO_CTRL_HDD_POWERON(int index, int value); -#elif defined(CONFIG_SYNO_HI3535_NVR) +#elif defined(MY_ABC_HERE) extern unsigned char SYNOHI3535IsBoardNeedPowerUpHDD(u32); extern int SYNO_CTRL_HDD_POWERON(int index, int value); #endif @@ -251,22 +251,22 @@ if (!ap->nr_pmp_links) { /* Internal disks case */ -#if defined(CONFIG_SYNO_MV88F6281) +#if defined(MY_DEF_HERE) /* now only 6281 some ata port support this feature */ if(0 == SYNOKirkwoodIsBoardNeedPowerUpHDD(ap->print_id)) { /* this port isn't support */ goto END; } -#elif defined(CONFIG_SYNO_X64) +#elif defined(MY_DEF_HERE) if(0 == SYNOX64IsSupportHDDPowerCtrl()) { goto END; } -#elif defined(CONFIG_SYNO_ARMADA) || defined(CONFIG_SYNO_ARMADA_V2) +#elif defined(MY_DEF_HERE) || defined(MY_DEF_HERE) if(0 == SYNOArmadaIsBoardNeedPowerUpHDD(ap->print_id)) { /* this port isn't support */ goto END; } -#elif defined(CONFIG_SYNO_COMCERTO) +#elif defined(MY_DEF_HERE) if(0 == SYNOComcerto2kIsBoardNeedPowerUpHDD(ap->print_id)) { /* this port isn't support */ goto END; @@ -276,12 +276,12 @@ /* this port isn't support */ goto END; } -#elif defined(CONFIG_SYNO_ALPINE) +#elif defined(MY_DEF_HERE) if(0 == SYNOALPINEIsBoardNeedPowerUpHDD(ap->print_id)) { /* this port isn't support */ goto END; } -#elif defined(CONFIG_SYNO_HI3535_NVR) +#elif defined(MY_ABC_HERE) if (0 == SYNOHI3535IsBoardNeedPowerUpHDD(ap->print_id)) { goto END; } diff -ur a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c --- a/drivers/ata/sata_mv.c 2016-04-25 01:33:48.000000000 +0200 +++ b/drivers/ata/sata_mv.c 2017-03-23 13:39:11.000000000 +0100 @@ -4356,9 +4356,9 @@ if (shost->hostt->syno_host_poweroff_task) { shost->hostt->syno_host_poweroff_task(shost); } -#ifdef CONFIG_SYNO_X64 +#ifdef MY_DEF_HERE syno_pulldown_eunit_gpio(host->ports[i]); -#endif /* CONFIG_SYNO_X64 */ +#endif /* MY_DEF_HERE */ } } diff -ur a/drivers/hwmon/syno_hddmon.c b/drivers/hwmon/syno_hddmon.c --- a/drivers/hwmon/syno_hddmon.c 2016-04-25 01:23:37.000000000 +0200 +++ b/drivers/hwmon/syno_hddmon.c 2017-03-23 13:23:15.000000000 +0100 @@ -5,7 +5,7 @@ #include #include #include -#if !defined(CONFIG_SYNO_X64) +#if !defined(MY_DEF_HERE) #include #endif #ifdef MY_ABC_HERE @@ -30,7 +30,7 @@ #define GPIO_UNDEF 0xFF -#if defined(CONFIG_SYNO_CEDARVIEW) || defined(CONFIG_ARCH_GEN3) || defined(CONFIG_SYNO_ARMADA) || defined(CONFIG_SYNO_ARMADA_V2) || defined(CONFIG_ARCH_COMCERTO) || defined(CONFIG_SYNO_AVOTON) || defined(CONFIG_SYNO_ALPINE) || defined(CONFIG_SYNO_HI3535_NVR) +#if defined(MY_DEF_HERE) || defined(CONFIG_ARCH_GEN3) || defined(MY_DEF_HERE) || defined(MY_DEF_HERE) || defined(CONFIG_ARCH_COMCERTO) || defined(MY_DEF_HERE) || defined(MY_DEF_HERE) || defined(MY_ABC_HERE) extern int SYNO_CHECK_HDD_PRESENT(int index); extern int SYNO_CTRL_HDD_POWERON(int index, int value); extern int SYNO_SUPPORT_HDD_DYNAMIC_ENABLE_POWER(void); diff -ur a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c --- a/drivers/i2c/algos/i2c-algo-bit.c 2016-04-25 01:34:53.000000000 +0200 +++ b/drivers/i2c/algos/i2c-algo-bit.c 2017-03-23 13:40:15.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /* ------------------------------------------------------------------------- * i2c-algo-bit.c i2c driver algorithms for bit-shift adapters * ------------------------------------------------------------------------- @@ -184,11 +187,11 @@ */ scllo(adap); } -#if defined(CONFIG_SYNO_FIX_THERMAL_SENSOR) +#if defined(MY_ABC_HERE) getsda(adap); -#else /* CONFIG_SYNO_FIX_THERMAL_SENSOR */ +#else /* MY_ABC_HERE */ sdahi(adap); -#endif /* CONFIG_SYNO_FIX_THERMAL_SENSOR */ +#endif /* MY_ABC_HERE */ if (sclhi(adap) < 0) { /* timeout */ bit_dbg(1, &i2c_adap->dev, "i2c_outb: 0x%02x, " "timeout at ack\n", (int)c); @@ -216,11 +219,11 @@ struct i2c_algo_bit_data *adap = i2c_adap->algo_data; /* assert: scl is low */ -#if defined(CONFIG_SYNO_FIX_THERMAL_SENSOR) +#if defined(MY_ABC_HERE) getsda(adap); -#else /* CONFIG_SYNO_FIX_THERMAL_SENSOR */ +#else /* MY_ABC_HERE */ sdahi(adap); -#endif /* CONFIG_SYNO_FIX_THERMAL_SENSOR */ +#endif /* MY_ABC_HERE */ for (i = 0; i < 8; i++) { if (sclhi(adap) < 0) { /* timeout */ diff -ur a/drivers/input/evbug.c b/drivers/input/evbug.c --- a/drivers/input/evbug.c 2016-04-25 01:29:29.000000000 +0200 +++ b/drivers/input/evbug.c 2017-03-23 13:33:51.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /* * Copyright (c) 1999-2001 Vojtech Pavlik */ @@ -40,7 +43,7 @@ static void evbug_event(struct input_handle *handle, unsigned int type, unsigned int code, int value) { -#if defined(CONFIG_SYNO_HI3535_VS) || defined(CONFIG_SYNO_HI3535_NVR) +#if defined(CONFIG_SYNO_HI3535_VS) || defined(MY_ABC_HERE) #else printk(KERN_DEBUG pr_fmt("Event. Dev: %s, Type: %d, Code: %d, Value: %d\n"), dev_name(&handle->dev->dev), type, code, value); diff -ur a/drivers/leds/leds-lp3943.c b/drivers/leds/leds-lp3943.c --- a/drivers/leds/leds-lp3943.c 2016-04-25 01:35:04.000000000 +0200 +++ b/drivers/leds/leds-lp3943.c 2017-03-23 13:40:28.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /* * Copyright 2012 Texas Instruments * @@ -16,9 +19,9 @@ #include #include #include -#ifdef CONFIG_SYNO_LP3943_FEATURES +#ifdef MY_ABC_HERE #include -#endif // CONFIG_SYNO_LP3943_FEATURES +#endif // MY_ABC_HERE #define MAX_NUM_LEDS 16 #define MAX_BRIGHTNESS 255 @@ -74,7 +77,7 @@ int num_leds; }; -#ifdef CONFIG_SYNO_LP3943_FEATURES +#ifdef MY_ABC_HERE static struct i2c_client *gpClient = NULL; static DEFINE_MUTEX(ModeLock); @@ -269,7 +272,7 @@ .platform_data = &syno_lp3943_pdata, }, }; -#endif // CONFIG_SYNO_LP3943_FEATURES +#endif // MY_ABC_HERE static int lp3943_read_byte(struct lp3943 *lp, u8 reg, u8 *data) { @@ -295,7 +298,7 @@ int ret; u8 tmp; -#ifdef CONFIG_SYNO_LP3943_FEATURES +#ifdef MY_ABC_HERE /*LS registers are modified in this function only, so this is the only part that we have to protect as a critical section*/ mutex_lock(&ModeLock); ret = lp3943_read_byte(lp, reg, &tmp); @@ -320,7 +323,7 @@ tmp |= data & mask; return lp3943_write_byte(lp, reg, tmp); -#endif // CONFIG_SYNO_LP3943_FEATURES +#endif // MY_ABC_HERE } static int lp3943_update_selector(struct lp3943 *lp, enum lp3943_led_mode mode, @@ -400,7 +403,7 @@ for (i = 0 ; i < node->num_channels ; i++) { channel = node->channel + i; -#ifdef CONFIG_SYNO_LP3943_FEATURES +#ifdef MY_ABC_HERE switch (led->brightness){ case 255: mode = LP3943_LED_ON; @@ -414,17 +417,17 @@ } #else mode = led->brightness == 0 ? LP3943_LED_OFF : node->mode; -#endif // CONFIG_SYNO_LP3943_FEATURES +#endif // MY_ABC_HERE ret = lp3943_update_selector(lp, mode, *channel); if (ret) return ret; -#ifdef CONFIG_SYNO_LP3943_FEATURES +#ifdef MY_ABC_HERE if (mode == LP3943_LED_OFF || mode == LP3943_LED_ON) continue; -#else // CONFIG_SYNO_LP3943_FEATURES +#else // MY_ABC_HERE if (mode == LP3943_LED_OFF) continue; -#endif // CONFIG_SYNO_LP3943_FEATURES +#endif // MY_ABC_HERE ret = lp3943_update_scale(lp, mode, node->prescale); if (ret) @@ -479,17 +482,17 @@ goto err_dev; } -#ifdef CONFIG_SYNO_LP3943_FEATURES +#ifdef MY_ABC_HERE INIT_WORK(&lp->led[i].brtwork, lp3943_brightness_work); -#endif // CONFIG_SYNO_LP3943_FEATURES +#endif // MY_ABC_HERE lp->led[i].id = i; lp->led[i].node = node; lp->led[i].cdev.name = node->name; lp->led[i].cdev.max_brightness = MAX_BRIGHTNESS; lp->led[i].cdev.brightness_set = lp3943_brightness_set; -#ifdef CONFIG_SYNO_LP3943_FEATURES +#ifdef MY_ABC_HERE lp->led[i].cdev.default_trigger = node->default_trigger; -#endif // CONFIG_SYNO_LP3943_FEATURES +#endif // MY_ABC_HERE ret = led_classdev_register(lp->dev, &lp->led[i].cdev); if (ret) { @@ -497,11 +500,11 @@ i, lp->num_leds, ret); goto err_dev; } -#ifdef CONFIG_SYNO_LP3943_FEATURES +#ifdef MY_ABC_HERE /* do nothing */ #else INIT_WORK(&lp->led[i].brtwork, lp3943_brightness_work); -#endif // CONFIG_SYNO_LP3943_FEATURES +#endif // MY_ABC_HERE } return 0; @@ -607,7 +610,7 @@ static int __init lp3943_init(void) { -#ifdef CONFIG_SYNO_LP3943_FEATURES +#ifdef MY_ABC_HERE int iErr = -1; struct i2c_adapter *pAdapter = NULL; /* instantiate the devices explicitly */ @@ -632,15 +635,15 @@ return iErr; #else return i2c_add_driver(&lp3943_driver); -#endif // CONFIG_SYNO_LP3943_FEATURES +#endif // MY_ABC_HERE } module_init(lp3943_init); static void __exit lp3943_exit(void) { -#ifdef CONFIG_SYNO_LP3943_FEATURES +#ifdef MY_ABC_HERE i2c_unregister_device(gpClient); -#endif // CONFIG_SYNO_LP3943_FEATURES +#endif // MY_ABC_HERE i2c_del_driver(&lp3943_driver); } module_exit(lp3943_exit); diff -ur a/drivers/leds/syno_ledtrig.c b/drivers/leds/syno_ledtrig.c --- a/drivers/leds/syno_ledtrig.c 2016-04-25 01:35:05.000000000 +0200 +++ b/drivers/leds/syno_ledtrig.c 2017-03-23 13:40:28.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif // Copyright (c) 2000-2014 Synology Inc. All rights reserved. #include #include @@ -6,7 +9,7 @@ #include #include -#ifdef CONFIG_SYNO_LEDS_TRIGGER +#ifdef MY_ABC_HERE typedef struct _tag_SYNO_LED_TRIGGER_TIMER { struct timer_list Timer; @@ -134,4 +137,4 @@ } module_exit(syno_ledtrig_exit); -#endif // CONFIG_SYNO_LEDS_TRIGGER +#endif // MY_ABC_HERE diff -ur a/drivers/md/linear.c b/drivers/md/linear.c --- a/drivers/md/linear.c 2016-04-25 01:25:47.000000000 +0200 +++ b/drivers/md/linear.c 2017-03-23 13:27:08.000000000 +0100 @@ -81,7 +81,7 @@ in some case, the device is removed, however this function is called, the only thing we can do is to return maxbytes as the end condition */ -#ifdef CONFIG_SYNO_HI3535_NVR +#ifdef MY_ABC_HERE if (dev0 && (NULL == dev0->rdev)) { rcu_read_unlock(); return maxbytes; diff -ur a/drivers/md/md.c b/drivers/md/md.c --- a/drivers/md/md.c 2016-04-25 01:25:54.000000000 +0200 +++ b/drivers/md/md.c 2017-03-23 13:27:29.000000000 +0100 @@ -7622,7 +7622,7 @@ #ifdef MY_ABC_HERE // # Test for DSM #56012. Workaround -#ifdef CONFIG_SYNO_LOWER_MD_RESYNC_NICE +#ifdef MY_DEF_HERE set_user_nice(current, 10); #endif #endif diff -ur a/drivers/md/raid10.c b/drivers/md/raid10.c --- a/drivers/md/raid10.c 2016-04-25 01:25:50.000000000 +0200 +++ b/drivers/md/raid10.c 2017-03-23 13:27:20.000000000 +0100 @@ -2168,7 +2168,7 @@ } else { ; } -#endif /* CONFIG_SYNO_MD_SECTOR_STATUS_REPORT */ +#endif /* MY_DEF_HERE */ } #else /* MY_ABC_HERE */ set_bit(WriteErrorSeen, &rdev->flags); diff -ur a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c --- a/drivers/mtd/cmdlinepart.c 2016-04-25 01:24:55.000000000 +0200 +++ b/drivers/mtd/cmdlinepart.c 2017-03-23 13:25:22.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /* * Read flash partition table from command line * @@ -66,7 +69,7 @@ struct mtd_partition *parts; }; -#if defined(CONFIG_SYNO_HI3535_VS) || defined(CONFIG_SYNO_HI3535_NVR) +#if defined(CONFIG_SYNO_HI3535_VS) || defined(MY_ABC_HERE) #define SYNO_MAX_MTD_DEV 2 static char *cmdline[SYNO_MAX_MTD_DEV]={0}; @@ -318,7 +321,7 @@ return 1; } -#if defined(CONFIG_SYNO_HI3535_VS) || defined(CONFIG_SYNO_HI3535_NVR) +#if defined(CONFIG_SYNO_HI3535_VS) || defined(MY_ABC_HERE) void syno_mtdpart_setup_real(void) { int i,j; @@ -355,7 +358,7 @@ /* parse command line */ if (!cmdline_parsed) -#if defined(CONFIG_SYNO_HI3535_VS) || defined(CONFIG_SYNO_HI3535_NVR) +#if defined(CONFIG_SYNO_HI3535_VS) || defined(MY_ABC_HERE) syno_mtdpart_setup_real(); #else mtdpart_setup_real(cmdline); @@ -403,7 +406,7 @@ */ static int mtdpart_setup(char *s) { - #if defined(CONFIG_SYNO_HI3535_VS) || defined(CONFIG_SYNO_HI3535_NVR) + #if defined(CONFIG_SYNO_HI3535_VS) || defined(MY_ABC_HERE) if (SYNO_MAX_MTD_DEV > cm_index) { cmdline[cm_index++] = s; } else { diff -ur a/drivers/mtd/devices/hisfc350/hisfc350_spi_ids.c b/drivers/mtd/devices/hisfc350/hisfc350_spi_ids.c --- a/drivers/mtd/devices/hisfc350/hisfc350_spi_ids.c 2016-04-25 01:25:05.000000000 +0200 +++ b/drivers/mtd/devices/hisfc350/hisfc350_spi_ids.c 2017-03-23 13:25:42.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /****************************************************************************** * Copyright (c) 2009-2010 by HiC. * All rights reserved. @@ -1339,7 +1342,7 @@ &spi_driver_general, }, -#ifdef CONFIG_SYNO_HI3535_NVR +#ifdef MY_ABC_HERE { "N25Q064", {0x20, 0xba, 0x17}, 3, (_64K * 128), _64K, 3, { diff -ur a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c --- a/drivers/mtd/mtdpart.c 2016-04-25 01:24:55.000000000 +0200 +++ b/drivers/mtd/mtdpart.c 2017-03-23 13:25:24.000000000 +0100 @@ -33,7 +33,7 @@ #include #include #include -#ifdef CONFIG_SYNO_MAC_ADDRESS +#ifdef MY_ABC_HERE #include #include #include @@ -41,11 +41,11 @@ #include "mtdcore.h" -#ifdef CONFIG_SYNO_MAC_ADDRESS +#ifdef MY_ABC_HERE extern unsigned char grgbLanMac[CONFIG_SYNO_MAC_IF][16]; #endif -#ifdef CONFIG_SYNO_SERIAL +#ifdef MY_ABC_HERE extern char gszSerialNum[]; extern char gszCustomSerialNum[]; #define SYNO_SN_TAG "SN=" @@ -549,7 +549,7 @@ out_register: -#if defined(CONFIG_SYNO_MAC_ADDRESS) +#if defined(MY_ABC_HERE) if ((memcmp(part->name, "vender", 7)==0) || (memcmp(part->name, "vendor", 7)==0)) { int gVenderMacNumber = 0; @@ -567,7 +567,7 @@ * If more lans needed, check DSM #52055 */ part_read(&slave->mtd, 0, 128, &retlen, rgbszBuf); -#ifdef CONFIG_SYNO_MAC_ADDRESS +#ifdef MY_ABC_HERE x = 0; gVenderMacNumber = 0; for (n = 0; n < CONFIG_SYNO_MAC_IF; n++) { @@ -596,9 +596,9 @@ x++; gVenderMacNumber++; } -#endif /* CONFIG_SYNO_MAC_ADDRESS */ +#endif /* MY_ABC_HERE */ -#ifdef CONFIG_SYNO_SERIAL +#ifdef MY_ABC_HERE char szSerialBuffer[32]; char *ptr; char szSerial[32]; @@ -687,9 +687,9 @@ } else { printk("Custom Serial Number: %s\n", gszCustomSerialNum); } -#endif /* CONFIG_SYNO_SERIAL */ +#endif /* MY_ABC_HERE */ } -#endif /* CONFIG_SYNO_MAC_ADDRESS */ +#endif /* MY_ABC_HERE */ return slave; } diff -ur a/drivers/mtd/nand/hinfc_spl_ids.c b/drivers/mtd/nand/hinfc_spl_ids.c --- a/drivers/mtd/nand/hinfc_spl_ids.c 2016-04-25 01:25:02.000000000 +0200 +++ b/drivers/mtd/nand/hinfc_spl_ids.c 2017-03-23 13:25:37.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /****************************************************************************** * Copyright (c) 2009-2010 by Hisilicon Tech. Co., Ltd. * All rights reserved. @@ -511,7 +514,7 @@ .flags = 0, #endif /* CONFIG_HI3535_SDK_2050 */ }, -#if defined(CONFIG_SYNO_HI3535_VS) || defined(CONFIG_SYNO_HI3535_NVR) +#if defined(CONFIG_SYNO_HI3535_VS) || defined(MY_ABC_HERE) { /* SLC 4bit/512 */ .name = "TC58NVG0S3ETA00", .id = {0x98, 0xDA, 0x90, 0x15, 0xF6, 0x14, 0x03, 0x00}, diff -ur a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c --- a/drivers/net/bonding/bond_main.c 2016-04-25 01:28:49.000000000 +0200 +++ b/drivers/net/bonding/bond_main.c 2017-03-23 13:32:55.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /* * originally based on the dummy device. * @@ -1674,7 +1677,7 @@ /* If this is the first slave, then we need to set the master's hardware * address to be the same as the slave's. */ if (is_zero_ether_addr(bond->dev->dev_addr)) -#ifdef CONFIG_SYNO_MAC_ADDRESS +#ifdef MY_ABC_HERE { unsigned char szMac[MAX_ADDR_LEN]; memset(szMac, 0, sizeof(szMac)); @@ -1726,7 +1729,7 @@ * that need it, and for restoring it upon release, and then * set it to the master's address */ -#ifdef CONFIG_SYNO_MAC_ADDRESS +#ifdef MY_ABC_HERE { unsigned char szMac[MAX_ADDR_LEN]; memset(szMac, 0, sizeof(szMac)); diff -ur a/drivers/net/ethernet/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmmac/stmmac_ethtool.c --- a/drivers/net/ethernet/stmmac/stmmac_ethtool.c 2016-04-25 01:26:58.000000000 +0200 +++ b/drivers/net/ethernet/stmmac/stmmac_ethtool.c 2017-03-23 13:29:08.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /******************************************************************************* STMMAC Ethtool support @@ -314,7 +317,7 @@ } } -#if defined(CONFIG_SYNO_HI3535_SUPPORT_WOL) +#if defined(MY_ABC_HERE) #define MAC_ADDR_LEN (6) int keep_standby_power(void) { @@ -358,7 +361,7 @@ spin_unlock_irq(&priv->lock); return 0; } -#endif /* CONFIG_SYNO_HI3535_SUPPORT_WOL */ +#endif /* MY_ABC_HERE */ /* Currently only support WOL through Magic packet. */ static void stmmac_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol) @@ -415,11 +418,11 @@ .get_ethtool_stats = stmmac_get_ethtool_stats, .get_strings = stmmac_get_strings, .get_wol = stmmac_get_wol, -#if defined(CONFIG_SYNO_HI3535_SUPPORT_WOL) +#if defined(MY_ABC_HERE) .set_wol = syno_stmmac_set_wol, #else .set_wol = stmmac_set_wol, -#endif /* CONFIG_SYNO_HI3535_SUPPORT_WOL */ +#endif /* MY_ABC_HERE */ .get_sset_count = stmmac_get_sset_count, }; diff -ur a/drivers/net/ethernet/stmmac/stmmac_main.c b/drivers/net/ethernet/stmmac/stmmac_main.c --- a/drivers/net/ethernet/stmmac/stmmac_main.c 2016-04-25 01:26:59.000000000 +0200 +++ b/drivers/net/ethernet/stmmac/stmmac_main.c 2017-03-23 13:29:20.000000000 +0100 @@ -76,7 +76,7 @@ #define SYNOP_GMAC_IRQNUM CONFIG_STMMAC_IRQNUM #endif -#ifdef CONFIG_SYNO_MAC_ADDRESS +#ifdef MY_ABC_HERE extern unsigned char grgbLanMac[CONFIG_SYNO_MAC_IF][16]; #endif @@ -627,11 +627,11 @@ else #endif -#ifdef CONFIG_SYNO_INCREASE_SKB_SIZE +#ifdef MY_ABC_HERE bfsize = BUF_SIZE_2KiB; -#else /* CONFIG_SYNO_INCREASE_SKB_SIZE */ +#else /* MY_ABC_HERE */ bfsize = DMA_BUFFER_SIZE; -#endif /* CONFIG_SYNO_INCREASE_SKB_SIZE */ +#endif /* MY_ABC_HERE */ #ifdef CONFIG_STMMAC_TIMER /* Disable interrupts on completion for the reception if timer is on */ @@ -2252,11 +2252,11 @@ struct sockaddr *addr = p; struct stmmac_priv *priv = netdev_priv(dev); -#if defined(CONFIG_SYNO_MAC_ADDRESS) -#else /* CONFIG_SYNO_MAC_ADDRESS */ +#if defined(MY_ABC_HERE) +#else /* MY_ABC_HERE */ if (netif_running(dev)) return -EBUSY; -#endif /* CONFIG_SYNO_MAC_ADDRESS */ +#endif /* MY_ABC_HERE */ if (!is_valid_ether_addr(addr->sa_data)) return -EADDRNOTAVAIL; memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); @@ -2304,7 +2304,7 @@ int ret = 0; struct stmmac_priv *priv = netdev_priv(dev); -#ifdef CONFIG_SYNO_MAC_ADDRESS +#ifdef MY_ABC_HERE char *pMac = NULL; u64 val = 0; int i; @@ -2341,7 +2341,7 @@ priv->pause = pause; netif_napi_add(dev, &priv->napi, stmmac_poll, 64); -#ifdef CONFIG_SYNO_MAC_ADDRESS +#ifdef MY_ABC_HERE if (CONFIG_SYNO_MAC_IF > priv->id) { pMac = grgbLanMac[priv->id]; diff -ur a/drivers/scsi/sd.c b/drivers/scsi/sd.c --- a/drivers/scsi/sd.c 2016-04-25 01:24:11.000000000 +0200 +++ b/drivers/scsi/sd.c 2017-03-23 13:24:04.000000000 +0100 @@ -3149,7 +3149,7 @@ sd_start_stop_device(sdkp, 0); } -#ifdef CONFIG_SYNO_SATA_IRQ_OFF +#ifdef MY_DEF_HERE /* The models which support deep sleep will cut the power of sata port * when reboot the machine, so issue STOP command before reboot */ sdp = sdkp->device; @@ -3162,7 +3162,7 @@ sd_start_stop_device(sdkp, 0); } } -#endif /* CONFIG_SYNO_SATA_IRQ_OFF */ +#endif /* MY_DEF_HERE */ exit: scsi_disk_put(sdkp); diff -ur a/drivers/tty/serial/8250.c b/drivers/tty/serial/8250.c --- a/drivers/tty/serial/8250.c 2016-04-25 01:23:55.000000000 +0200 +++ b/drivers/tty/serial/8250.c 2017-03-23 13:23:43.000000000 +0100 @@ -54,7 +54,7 @@ #include "suncore.h" #endif -#if defined(CONFIG_SYNO_COMCERTO) && defined(CONFIG_ARCH_M86XXX) +#if defined(MY_DEF_HERE) && defined(CONFIG_ARCH_M86XXX) #include #include static struct clk *uart_clk; /*UART Clock(DUS) depends upon the AXI*/ @@ -451,7 +451,7 @@ return readb(p->membase + offset); } -#if defined(CONFIG_SYNO_COMCERTO) && defined(CONFIG_ARCH_M86XXX) +#if defined(MY_DEF_HERE) && defined(CONFIG_ARCH_M86XXX) void serial8250_clear_and_reinit_fifos(struct uart_8250_port *p); void dw8250_force_idle(struct uart_port *p) @@ -465,7 +465,7 @@ static void mem_serial_out(struct uart_port *p, int offset, int value) { -#if defined(CONFIG_SYNO_COMCERTO) && defined(CONFIG_ARCH_M86XXX) +#if defined(MY_DEF_HERE) && defined(CONFIG_ARCH_M86XXX) int offset1 = map_8250_out_reg(p, offset) << p->regshift; writeb(value, p->membase + offset1); @@ -510,7 +510,7 @@ __raw_writel(value, p->membase + offset); } -#if defined(CONFIG_SYNO_ARMADA_ARCH) || defined(CONFIG_SYNO_ARMADA_ARCH_V2) || defined(CONFIG_SYNO_C2K_SERIAL_FIX) +#if defined(MY_DEF_HERE) || defined(MY_DEF_HERE) || defined(MY_DEF_HERE) /* Save the LCR value so it can be re-written when a Busy Detect IRQ occurs. */ static inline void dwapb_save_out_value(struct uart_port *p, int offset, int value) @@ -533,7 +533,7 @@ { int save_offset = offset; offset = map_8250_out_reg(p, offset) << p->regshift; -#if defined(CONFIG_PLAT_ARMADA) || defined(CONFIG_SYNO_ARMADA_ARCH_V2) || defined(CONFIG_SYNO_C2K_SERIAL_FIX) +#if defined(CONFIG_PLAT_ARMADA) || defined(MY_DEF_HERE) || defined(MY_DEF_HERE) /* If we are accessing DLH (0x4), DLL (0x0), LCR(0xC) or 0x1C ** we need to make sure that the busy bit is cleared in USR register. */ @@ -584,7 +584,7 @@ break; case UPIO_RM9000: -#if defined(CONFIG_SYNO_ARMADA_ARCH) || defined(CONFIG_SYNO_ARMADA_ARCH_V2) || defined(CONFIG_SYNO_C2K_SERIAL_FIX) +#if defined(MY_DEF_HERE) || defined(MY_DEF_HERE) || defined(MY_DEF_HERE) p->serial_in = mem_serial_in; p->serial_out = dwapb_serial_out; break; @@ -725,7 +725,7 @@ } } -#if defined(CONFIG_SYNO_COMCERTO) && defined(CONFIG_ARCH_M86XXX) +#if defined(MY_DEF_HERE) && defined(CONFIG_ARCH_M86XXX) void serial8250_clear_and_reinit_fifos(struct uart_8250_port *p) { unsigned char fcr; @@ -1166,7 +1166,7 @@ */ DEBUG_AUTOCONF("Xscale "); up->port.type = PORT_XSCALE; -#if defined(CONFIG_SYNO_ARMADA_ARCH) || defined(CONFIG_SYNO_ARMADA_ARCH_V2) || defined(CONFIG_SYNO_C2K_SERIAL_FIX) +#if defined(MY_DEF_HERE) || defined(MY_DEF_HERE) || defined(MY_DEF_HERE) up->capabilities |= UART_CAP_UUE; #else up->capabilities |= UART_CAP_UUE | UART_CAP_RTOIE; @@ -1875,14 +1875,14 @@ do { struct uart_8250_port *up; struct uart_port *port; -#if defined(CONFIG_SYNO_ARMADA_ARCH) || defined(CONFIG_SYNO_ARMADA_ARCH_V2) || defined(CONFIG_SYNO_C2K_SERIAL_FIX) +#if defined(MY_DEF_HERE) || defined(MY_DEF_HERE) || defined(MY_DEF_HERE) unsigned int iir; #endif up = list_entry(l, struct uart_8250_port, list); port = &up->port; -#if defined(CONFIG_SYNO_ARMADA_ARCH) || defined(CONFIG_SYNO_ARMADA_ARCH_V2) || defined(CONFIG_SYNO_C2K_SERIAL_FIX) +#if defined(MY_DEF_HERE) || defined(MY_DEF_HERE) || defined(MY_DEF_HERE) iir = serial_in(up, UART_IIR); if (!(iir & UART_IIR_NO_INT)) { serial8250_handle_port(up); @@ -1898,7 +1898,7 @@ * the UART status register (USR) and the LCR re-written. */ unsigned int status; status = *(volatile u32 *)up->port.private_data; -#ifdef CONFIG_SYNO_ARMADA_ARCH_V2 +#ifdef MY_DEF_HERE /* serial_out(up, UART_LCR, up->lcr); */ #else serial_out(up, UART_LCR, up->lcr); @@ -2630,7 +2630,7 @@ * have sufficient FIFO entries for the latency of the remote * UART to respond. IOW, at least 32 bytes of FIFO. */ -#if defined(CONFIG_SYNO_COMCERTO) && defined(CONFIG_ARCH_M86XXX) +#if defined(MY_DEF_HERE) && defined(CONFIG_ARCH_M86XXX) up->mcr &= ~UART_MCR_AFE; if (termios->c_cflag & CRTSCTS) up->mcr |= UART_MCR_AFE; @@ -3359,7 +3359,7 @@ struct uart_port port; int ret, i, irqflag = 0; -#if defined(CONFIG_SYNO_COMCERTO) && defined(CONFIG_ARCH_M86XXX) +#if defined(MY_DEF_HERE) && defined(CONFIG_ARCH_M86XXX) unsigned long uart_rate; /* Take the Fast-UART device Out-Of-Reset*/ @@ -3394,7 +3394,7 @@ port.membase = p->membase; port.irq = p->irq; port.irqflags = p->irqflags; -#if defined(CONFIG_SYNO_COMCERTO) && defined(CONFIG_ARCH_M86XXX) +#if defined(MY_DEF_HERE) && defined(CONFIG_ARCH_M86XXX) port.uartclk = uart_rate; /* Assigning the rate value to the ports */ #else port.uartclk = p->uartclk; @@ -3437,7 +3437,7 @@ if (up->port.dev == &dev->dev) serial8250_unregister_port(i); } -#if defined(CONFIG_SYNO_COMCERTO) && defined(CONFIG_ARCH_M86XXX) +#if defined(MY_DEF_HERE) && defined(CONFIG_ARCH_M86XXX) /*Disable the Fast-UART clock here*/ clk_disable(uart_clk); clk_put(uart_clk); @@ -3449,7 +3449,7 @@ return 0; } -#if !defined(CONFIG_SYNO_COMCERTO) || defined(CONFIG_PM) +#if !defined(MY_DEF_HERE) || defined(CONFIG_PM) static int serial8250_suspend(struct platform_device *dev, pm_message_t state) { int i; @@ -3461,7 +3461,7 @@ uart_suspend_port(&serial8250_reg, &up->port); } -#if defined(CONFIG_SYNO_COMCERTO) && defined(CONFIG_ARCH_M86XXX) +#if defined(MY_DEF_HERE) && defined(CONFIG_ARCH_M86XXX) /* Now Do the FAST_UART_CLOCK gating here, be sure no other devices * are using the DUS clock to shutdown the clock. * Here above clock is derived from DUS , henece it will be not @@ -3478,7 +3478,7 @@ { int i; -#if defined(CONFIG_SYNO_COMCERTO) && defined(CONFIG_ARCH_M86XXX) +#if defined(MY_DEF_HERE) && defined(CONFIG_ARCH_M86XXX) /* Now Enable the FAST_UART_CLOCK here , before * before resuming any opertions. */ @@ -3506,7 +3506,7 @@ static struct platform_driver serial8250_isa_driver = { .probe = serial8250_probe, .remove = __devexit_p(serial8250_remove), -#if !defined(CONFIG_SYNO_COMCERTO) || defined(CONFIG_PM) +#if !defined(MY_DEF_HERE) || defined(CONFIG_PM) .suspend = serial8250_suspend, .resume = serial8250_resume, #endif diff -ur a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c --- a/drivers/tty/serial/amba-pl011.c 2016-04-25 01:23:53.000000000 +0200 +++ b/drivers/tty/serial/amba-pl011.c 2017-03-23 13:23:41.000000000 +0100 @@ -65,11 +65,11 @@ #define UART_NR 14 -#ifdef CONFIG_SYNO_HI3535_NVR +#ifdef MY_ABC_HERE #define SERIAL_AMBA_MAJOR 4 #else #define SERIAL_AMBA_MAJOR 204 -#endif /* CONFIG_SYNO_HI3535_NVR */ +#endif /* MY_ABC_HERE */ #define SERIAL_AMBA_MINOR 64 #define SERIAL_AMBA_NR UART_NR @@ -1971,11 +1971,11 @@ static struct uart_driver amba_reg; static struct console amba_console = { -#ifdef CONFIG_SYNO_HI3535_NVR +#ifdef MY_ABC_HERE .name = "ttyS", #else .name = "ttyAMA", -#endif /* CONFIG_SYNO_HI3535_NVR */ +#endif /* MY_ABC_HERE */ .write = pl011_console_write, .device = uart_console_device, .setup = pl011_console_setup, @@ -1991,13 +1991,13 @@ static struct uart_driver amba_reg = { .owner = THIS_MODULE, -#ifdef CONFIG_SYNO_HI3535_NVR +#ifdef MY_ABC_HERE .driver_name = "ttyS", .dev_name = "ttyS", #else .driver_name = "ttyAMA", .dev_name = "ttyAMA", -#endif /* CONFIG_SYNO_HI3535_NVR */ +#endif /* MY_ABC_HERE */ .major = SERIAL_AMBA_MAJOR, .minor = SERIAL_AMBA_MINOR, .nr = UART_NR, diff -ur a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c --- a/drivers/usb/core/hub.c 2016-04-25 01:32:23.000000000 +0200 +++ b/drivers/usb/core/hub.c 2017-03-23 13:37:47.000000000 +0100 @@ -3434,13 +3434,13 @@ if (r) { #ifdef CONFIG_HI3535_SDK_2050 struct usb_hcd *hcd = bus_to_hcd(udev->bus); -#ifdef CONFIG_SYNO_HI3535_NVR +#ifdef MY_ABC_HERE if (hcd->driver->hi_ehci_reset) { hcd->driver->hi_ehci_reset(hcd); } #else hcd->driver->hi_ehci_reset(hcd); -#endif /* CONFIG_SYNO_HI3535_NVR */ +#endif /* MY_ABC_HERE */ #endif /* CONFIG_HI3535_SDK_2050 */ dev_err(&udev->dev, "device descriptor read/64, error %d\n", @@ -3955,13 +3955,13 @@ !(hcd->driver->port_handed_over)(hcd, port1)) { hcd->driver->relinquish_port(hcd, port1); -#ifdef CONFIG_SYNO_HI3535_NVR +#ifdef MY_ABC_HERE if (hcd->driver->hi_ehci_reset) { hcd->driver->hi_ehci_reset(hcd); } #else hcd->driver->hi_ehci_reset(hcd); -#endif /* CONFIG_SYNO_HI3535_NVR */ +#endif /* MY_ABC_HERE */ } } #else /* CONFIG_HI3535_SDK_2050 */ @@ -4661,13 +4661,13 @@ #ifdef CONFIG_HI3535_SDK_2050 if (retry_reset == 1) { struct usb_hcd *hcd = bus_to_hcd(udev->bus); -#ifdef CONFIG_SYNO_HI3535_NVR +#ifdef MY_ABC_HERE if (hcd->driver->hi_ehci_reset) { hcd->driver->hi_ehci_reset(hcd); } #else hcd->driver->hi_ehci_reset(hcd); -#endif /* CONFIG_SYNO_HI3535_NVR */ +#endif /* MY_ABC_HERE */ } #endif /* CONFIG_HI3535_SDK_2050 */ if (udev->state == USB_STATE_NOTATTACHED || diff -ur a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c --- a/drivers/usb/core/usb.c 2016-04-25 01:32:20.000000000 +0200 +++ b/drivers/usb/core/usb.c 2017-03-23 13:37:38.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /* * drivers/usb/core/usb.c * @@ -36,9 +39,9 @@ #include #include #include -#ifdef CONFIG_SYNO_ENABLE_USBFS_ENTRY +#ifdef MY_ABC_HERE #include -#endif /* CONFIG_SYNO_ENABLE_USBFS_ENTRY */ +#endif /* MY_ABC_HERE */ #include #include @@ -973,9 +976,9 @@ EXPORT_SYMBOL_GPL(usb_debug_root); static struct dentry *usb_debug_devices; -#ifdef CONFIG_SYNO_ENABLE_USBFS_ENTRY +#ifdef MY_ABC_HERE static struct proc_dir_entry *usbdir = NULL; -#endif /* CONFIG_SYNO_ENABLE_USBFS_ENTRY */ +#endif /* MY_ABC_HERE */ static int usb_debugfs_init(void) { @@ -992,13 +995,13 @@ return -ENOENT; } -#ifdef CONFIG_SYNO_ENABLE_USBFS_ENTRY +#ifdef MY_ABC_HERE /* create mount point for /proc/bus/usb */ usbdir = proc_mkdir("bus/usb", NULL); if (!usbdir) { printk(KERN_ERR "Fail to create /proc/bus/usb\n"); } -#endif /* CONFIG_SYNO_ENABLE_USBFS_ENTRY */ +#endif /* MY_ABC_HERE */ return 0; } @@ -1007,10 +1010,10 @@ { debugfs_remove(usb_debug_devices); debugfs_remove(usb_debug_root); -#ifdef CONFIG_SYNO_ENABLE_USBFS_ENTRY +#ifdef MY_ABC_HERE if (usbdir) remove_proc_entry("bus/usb", NULL); -#endif /* CONFIG_SYNO_ENABLE_USBFS_ENTRY */ +#endif /* MY_ABC_HERE */ } /* diff -ur a/drivers/usb/host/hiusb-xhci.c b/drivers/usb/host/hiusb-xhci.c --- a/drivers/usb/host/hiusb-xhci.c 2016-04-25 01:32:30.000000000 +0200 +++ b/drivers/usb/host/hiusb-xhci.c 2017-03-23 13:37:50.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif #include #include #include @@ -29,7 +32,7 @@ static u64 usb_dmamask = DMA_BIT_MASK(32); -#if defined(CONFIG_SYNO_HI3535_VS) || defined(CONFIG_SYNO_HI3535_NVR) +#if defined(CONFIG_SYNO_HI3535_VS) || defined(MY_ABC_HERE) void dummy_hiusb_xhci_release() { } #endif @@ -42,7 +45,7 @@ .platform_data = &hiusb_data, .dma_mask = &usb_dmamask, .coherent_dma_mask = DMA_BIT_MASK(32), -#if defined(CONFIG_SYNO_HI3535_VS) || defined(CONFIG_SYNO_HI3535_NVR) +#if defined(CONFIG_SYNO_HI3535_VS) || defined(MY_ABC_HERE) .release = dummy_hiusb_xhci_release, #endif }, @@ -50,7 +53,7 @@ .resource = hiusb_xhci_res, }; -#if defined(CONFIG_SYNO_HI3535_VS) || defined(CONFIG_SYNO_HI3535_NVR) +#if defined(CONFIG_SYNO_HI3535_VS) || defined(MY_ABC_HERE) int xhci_register_hi3535(void) #else static int __init xhci_device_init(void) @@ -61,7 +64,7 @@ return platform_device_register(&hiusb_xhci_platdev); } -#if defined(CONFIG_SYNO_HI3535_VS) || defined(CONFIG_SYNO_HI3535_NVR) +#if defined(CONFIG_SYNO_HI3535_VS) || defined(MY_ABC_HERE) void xhci_unregister_hi3535(void) #else static void __exit xhci_device_exit(void) @@ -70,7 +73,7 @@ platform_device_unregister(&hiusb_xhci_platdev); } -#if defined(CONFIG_SYNO_HI3535_VS) || defined(CONFIG_SYNO_HI3535_NVR) +#if defined(CONFIG_SYNO_HI3535_VS) || defined(MY_ABC_HERE) #else module_init(xhci_device_init); module_exit(xhci_device_exit); diff -ur a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c --- a/drivers/usb/host/xhci.c 2016-04-25 01:32:30.000000000 +0200 +++ b/drivers/usb/host/xhci.c 2017-03-23 13:37:56.000000000 +0100 @@ -585,7 +585,7 @@ } #endif -#ifdef CONFIG_SYNO_FACTORY_USB3_DISABLE +#ifdef MY_ABC_HERE extern int gSynoFactoryUSB3Disable; #endif @@ -608,7 +608,7 @@ xhci_dbg(xhci, "Finished xhci_run for USB3 roothub\n"); -#ifdef CONFIG_SYNO_FACTORY_USB3_DISABLE +#ifdef MY_ABC_HERE if (1 == gSynoFactoryUSB3Disable) { printk("xhci USB3 ports are disabled!\n"); } @@ -622,7 +622,7 @@ #endif #if defined(MY_DEF_HERE) || defined(MY_ABC_HERE) -#ifdef CONFIG_SYNO_FACTORY_USB3_DISABLE +#ifdef MY_ABC_HERE if(1 == gSynoFactoryUSB3Disable || PCI_VENDOR_ID_ETRON == xhci_vendor) { xhci_special_reset = XHCI_SPECIAL_RESET_DISABLE; } else { @@ -635,7 +635,7 @@ #if defined(MY_DEF_HERE) xhci_task = kthread_run(xhci_thread, NULL, "xhci_thread"); #endif -#endif //CONFIG_SYNO_FACTORY_USB3_DISABLE +#endif //MY_ABC_HERE #endif //MY_DEF_HERE || MY_ABC_HERE return 0; @@ -4289,7 +4289,7 @@ printk(KERN_DEBUG "Problem registering platform driver."); goto unreg_pci; } -#if defined(CONFIG_SYNO_HI3535_VS) || defined(CONFIG_SYNO_HI3535_NVR) +#if defined(CONFIG_SYNO_HI3535_VS) || defined(MY_ABC_HERE) retval = xhci_register_hi3535(); if (retval < 0) { printk(KERN_DEBUG "Problem registering hi3535 driver."); @@ -4325,7 +4325,7 @@ { xhci_unregister_pci(); xhci_unregister_plat(); -#if defined(CONFIG_SYNO_HI3535_VS) || defined(CONFIG_SYNO_HI3535_NVR) +#if defined(CONFIG_SYNO_HI3535_VS) || defined(MY_ABC_HERE) xhci_unregister_hi3535(); #endif } diff -ur a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h --- a/drivers/usb/host/xhci.h 2016-04-25 01:32:41.000000000 +0200 +++ b/drivers/usb/host/xhci.h 2017-03-23 13:38:04.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /* * xHCI host controller driver * @@ -1702,7 +1705,7 @@ { } #endif -#if defined(CONFIG_SYNO_HI3535_VS) || defined(CONFIG_SYNO_HI3535_NVR) +#if defined(CONFIG_SYNO_HI3535_VS) || defined(MY_ABC_HERE) int xhci_register_hi3535(void); void xhci_unregister_hi3535(void); #endif diff -ur a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c --- a/drivers/usb/host/xhci-hub.c 2016-04-25 01:32:31.000000000 +0200 +++ b/drivers/usb/host/xhci-hub.c 2017-03-23 13:37:54.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /* * xHCI host controller driver * @@ -409,7 +412,7 @@ return max_ports; } -#if defined(CONFIG_SYNO_FACTORY_USB3_DISABLE) +#if defined(MY_ABC_HERE) /* * get the mapping port array. * if hcd is usb3, return usb2's port_array, and vice versa. @@ -531,7 +534,7 @@ *status |= pls; } -#ifdef CONFIG_SYNO_FACTORY_USB3_DISABLE +#ifdef MY_ABC_HERE #include extern int gSynoFactoryUSB3Disable; #endif @@ -568,12 +571,12 @@ int max_ports; unsigned long flags; u32 temp, status; -#if defined(CONFIG_SYNO_FACTORY_USB3_DISABLE) +#if defined(MY_ABC_HERE) u32 temp_map; #endif int retval = 0; __le32 __iomem **port_array; -#if defined(CONFIG_SYNO_FACTORY_USB3_DISABLE) +#if defined(MY_ABC_HERE) __le32 __iomem **port_array_map; struct pci_dev *pdev = to_pci_dev(hcd->self.controller); #endif @@ -584,7 +587,7 @@ unsigned selector; max_ports = xhci_get_ports(hcd, &port_array); -#if defined(CONFIG_SYNO_FACTORY_USB3_DISABLE) +#if defined(MY_ABC_HERE) xhci_get_ports_map(hcd, &port_array_map); // max_ports should be the same, only for NEC fixes #endif bus_state = &xhci->bus_state[hcd_index(hcd)]; @@ -740,7 +743,7 @@ goto error; wIndex--; temp = xhci_readl(xhci, port_array[wIndex]); -#if defined(CONFIG_SYNO_FACTORY_USB3_DISABLE) +#if defined(MY_ABC_HERE) temp_map = xhci_readl(xhci, port_array_map[wIndex]); #endif if (temp == 0xffffffff) { @@ -862,7 +865,7 @@ * However, khubd will ignore the roothub events until * the roothub is registered. */ -#ifdef CONFIG_SYNO_FACTORY_USB3_DISABLE +#ifdef MY_ABC_HERE xhci_dbg(xhci, "set port power. hcd->speed:%d.\n",hcd->speed); if (1 == gSynoFactoryUSB3Disable && hcd->speed == HCD_USB3) xhci_writel(xhci, temp & ~PORT_POWER, port_array[wIndex]); diff -ur a/fs/debugfs/inode.c b/fs/debugfs/inode.c --- a/fs/debugfs/inode.c 2016-04-25 01:20:32.000000000 +0200 +++ b/fs/debugfs/inode.c 2017-03-23 13:18:04.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /* * inode.c - part of debugfs, a tiny little debug file system * @@ -596,7 +599,7 @@ } EXPORT_SYMBOL_GPL(debugfs_remove_recursive); -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE extern struct synotify_rename_path * get_rename_path_list(struct dentry *old_dentry, struct dentry *new_dentry); extern void free_rename_path_list(struct synotify_rename_path * rename_path_list); #endif @@ -625,7 +628,7 @@ int error; struct dentry *dentry = NULL, *trap; const char *old_name; -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE struct synotify_rename_path *rename_path_list = NULL; #endif @@ -642,7 +645,7 @@ if (IS_ERR(dentry) || dentry == trap || dentry->d_inode) goto exit; -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE rename_path_list = get_rename_path_list(old_dentry, dentry); #endif old_name = fsnotify_oldname_init(old_dentry->d_name.name); @@ -654,7 +657,7 @@ goto exit; } d_move(old_dentry, dentry); -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE fsnotify_move(old_dir->d_inode, new_dir->d_inode, old_name, S_ISDIR(old_dentry->d_inode->i_mode), NULL, old_dentry, rename_path_list); @@ -668,13 +671,13 @@ unlock_rename(new_dir, old_dir); dput(dentry); -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE free_rename_path_list(rename_path_list); rename_path_list = NULL; #endif return old_dentry; exit: -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE free_rename_path_list(rename_path_list); #endif if (dentry && !IS_ERR(dentry)) diff -ur a/fs/namei.c b/fs/namei.c --- a/fs/namei.c 2016-04-25 01:19:51.000000000 +0200 +++ b/fs/namei.c 2017-03-23 13:16:58.000000000 +0100 @@ -1053,7 +1053,7 @@ return 1; } -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE /* Fetch full mount point path, It traverse vfsmount from down to up by following mnt_parent @@ -1099,7 +1099,7 @@ kfree(mnt_full_path_buf); return ret; } -#endif /* CONFIG_SYNO_NOTIFY */ +#endif /* MY_ABC_HERE */ /* * Perform an automount @@ -3969,7 +3969,7 @@ return error; } -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE inline void free_rename_path_list(struct synotify_rename_path * rename_path_list) { while(rename_path_list) { @@ -4143,7 +4143,7 @@ int error; int is_dir = S_ISDIR(old_dentry->d_inode->i_mode); const unsigned char *old_name; -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE struct synotify_rename_path *rename_path_list = NULL; __u32 old_dir_mask = (FS_EVENT_ON_CHILD | FS_MOVED_FROM); __u32 new_dir_mask = (FS_EVENT_ON_CHILD | FS_MOVED_TO); @@ -4170,7 +4170,7 @@ if (!old_dir->i_op->rename) return -EPERM; -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE if (old_dir == new_dir) old_dir_mask |= FS_DN_RENAME; @@ -4188,7 +4188,7 @@ else error = vfs_rename_other(old_dir,old_dentry,new_dir,new_dentry); if (!error) -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE fsnotify_move(old_dir, new_dir, old_name, is_dir, new_dentry->d_inode, old_dentry, rename_path_list); #else @@ -4197,7 +4197,7 @@ #endif fsnotify_oldname_free(old_name); -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE free_rename_path_list(rename_path_list); #endif return error; @@ -4451,7 +4451,7 @@ EXPORT_SYMBOL(follow_down_one); EXPORT_SYMBOL(follow_down); EXPORT_SYMBOL(follow_up); -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE EXPORT_SYMBOL(syno_fetch_mountpoint_fullpath); #endif EXPORT_SYMBOL(get_write_access); /* binfmt_aout */ diff -ur a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c --- a/fs/notify/dnotify/dnotify.c 2016-04-25 01:20:54.000000000 +0200 +++ b/fs/notify/dnotify/dnotify.c 2017-03-23 13:18:42.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /* * Directory notifications for Linux. * @@ -133,7 +136,7 @@ struct fsnotify_mark *vfsmount_mark, __u32 mask, void *data, int data_type) { -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE if (data_type == FSNOTIFY_EVENT_SYNO) return false; #endif diff -ur a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c --- a/fs/notify/fsnotify.c 2016-04-25 01:20:54.000000000 +0200 +++ b/fs/notify/fsnotify.c 2017-03-23 13:18:42.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /* * Copyright (C) 2008 Red Hat, Inc., Eric Paris * @@ -28,7 +31,7 @@ #include "fsnotify.h" #include "../mount.h" -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE #include #endif @@ -300,7 +303,7 @@ } EXPORT_SYMBOL_GPL(fsnotify); -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE /* * notify_event * @@ -451,7 +454,7 @@ return ret; } EXPORT_SYMBOL(SYNONotify); -#endif /* CONFIG_SYNO_NOTIFY */ +#endif /* MY_ABC_HERE */ static __init int fsnotify_init(void) { diff -ur a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c --- a/fs/notify/inotify/inotify_fsnotify.c 2016-04-25 01:20:54.000000000 +0200 +++ b/fs/notify/inotify/inotify_fsnotify.c 2017-03-23 13:18:42.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /* * fs/inotify_user.c - inotify support for userspace * @@ -146,7 +149,7 @@ struct fsnotify_mark *vfsmount_mark, __u32 mask, void *data, int data_type) { -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE if (data_type == FSNOTIFY_EVENT_SYNO) return false; #endif diff -ur a/fs/notify/notification.c b/fs/notify/notification.c --- a/fs/notify/notification.c 2016-04-25 01:20:54.000000000 +0200 +++ b/fs/notify/notification.c 2017-03-23 13:18:42.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /* * Copyright (C) 2008 Red Hat, Inc., Eric Paris * @@ -89,7 +92,7 @@ if (atomic_dec_and_test(&event->refcnt)) { pr_debug("%s: event=%p\n", __func__, event); -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE if (event->data_type == FSNOTIFY_EVENT_PATH || event->data_type == FSNOTIFY_EVENT_SYNO) #else if (event->data_type == FSNOTIFY_EVENT_PATH) @@ -99,7 +102,7 @@ BUG_ON(!list_empty(&event->private_data_list)); kfree(event->file_name); -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE kfree(event->full_name); #endif put_pid(event->tgid); @@ -139,7 +142,7 @@ return priv; } -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE // base_name should have leading '/' static void formalize_full_path(const char *mnt_name, const char *base_name, char *full_path){ if (mnt_name[0] == '/'){ @@ -205,7 +208,7 @@ kfree(mnt_full_path); return ret; } -#endif /* CONFIG_SYNO_NOTIFY */ +#endif /* MY_ABC_HERE */ /* * Add an event to the group notification queue. The group can later pull this @@ -292,7 +295,7 @@ group->q_len++; holder->event = event; -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE /* we fetch full name after it is decided to inqueue. */ if (event->data_type == FSNOTIFY_EVENT_SYNO || event->data_type == FSNOTIFY_EVENT_PATH) { @@ -464,7 +467,7 @@ return NULL; } } -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE if (event->full_name_len) { event->full_name = kstrdup(old_event->full_name, GFP_KERNEL); if (!event->full_name) { @@ -474,7 +477,7 @@ } #endif event->tgid = get_pid(old_event->tgid); -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE if (event->data_type == FSNOTIFY_EVENT_PATH || event->data_type == FSNOTIFY_EVENT_SYNO) #else if (event->data_type == FSNOTIFY_EVENT_PATH) @@ -526,7 +529,7 @@ event->data_type = data_type; switch (data_type) { -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE case FSNOTIFY_EVENT_SYNO: #endif case FSNOTIFY_EVENT_PATH: { diff -ur a/include/linux/btrfs.h b/include/linux/btrfs.h --- a/include/linux/btrfs.h 2016-04-25 01:22:28.000000000 +0200 +++ b/include/linux/btrfs.h 2017-03-23 13:21:35.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /* * Copyright (C) 2007 Oracle. All rights reserved. * @@ -36,12 +39,12 @@ #define BTRFS_SUBVOL_CREATE_ASYNC (1ULL << 0) #define BTRFS_SUBVOL_RDONLY (1ULL << 1) #define BTRFS_SUBVOL_QGROUP_INHERIT (1ULL << 2) -#ifdef CONFIG_SYNO_BTRFS_SUBVOLUME_HIDE +#ifdef MY_DEF_HERE #define BTRFS_SUBVOL_HIDE (1ULL << 32) -#endif /* CONFIG_SYNO_BTRFS_SUBVOLUME_HIDE */ -#ifdef CONFIG_SYNO_BTRFS_USRQUOTA +#endif /* MY_DEF_HERE */ +#ifdef MY_DEF_HERE #define BTRFS_SUBVOL_NOLOAD_USRQUOTA (1ULL << 33) -#endif /* CONFIG_SYNO_BTRFS_USRQUOTA */ +#endif /* MY_DEF_HERE */ #define BTRFS_FSID_SIZE 16 #define BTRFS_UUID_SIZE 16 #define BTRFS_UUID_UNPARSED_SIZE 37 @@ -75,7 +78,7 @@ __s64 fd; __u64 transid; __u64 flags; -#ifdef CONFIG_SYNO_BTRFS_USRQUOTA +#ifdef MY_DEF_HERE __u64 copy_limit_from; #endif union { @@ -428,7 +431,7 @@ __u64 unused[128 - 2 - BTRFS_DEV_STAT_VALUES_MAX]; /* pad to 1k */ }; -#ifdef CONFIG_SYNO_BTRFS_USRQUOTA +#ifdef MY_DEF_HERE #define BTRFS_USRQUOTA_CTL_ENABLE 1 #define BTRFS_USRQUOTA_CTL_DISABLE 2 #define BTRFS_USRQUOTA_CTL_DUMPTREE 3 @@ -460,9 +463,9 @@ /* reservation tracking */ __u64 reserved; }; -#endif /* CONFIG_SYNO_BTRFS_USRQUOTA */ +#endif /* MY_DEF_HERE */ -#ifdef CONFIG_SYNO_BTRFS_ERROR_REPORT +#ifdef MY_DEF_HERE struct btrfs_ioctl_cksumfailed_files_args { __u64 sub_vol; __u64 ino; @@ -494,7 +497,7 @@ __u64 qgroupid; }; -#ifdef CONFIG_SYNO_BTRFS_QGROUP_QUERY +#ifdef MY_DEF_HERE struct btrfs_ioctl_qgroup_query_args { /* state */ __u64 rfer; @@ -511,7 +514,7 @@ /* reservation tracking */ __u64 reserved; }; -#endif /* CONFIG_SYNO_BTRFS_QGROUP_QUERY */ +#endif /* MY_DEF_HERE */ struct btrfs_ioctl_timespec { __u64 sec; @@ -525,15 +528,15 @@ struct btrfs_ioctl_timespec stime; /* in */ struct btrfs_ioctl_timespec rtime; /* out */ __u64 flags; /* in */ -#ifdef CONFIG_SYNO_BTRFS_SEND +#ifdef MY_DEF_HERE struct btrfs_ioctl_timespec otime; /* in */ __u64 reserved[14]; /* in */ #else __u64 reserved[16]; /* in */ -#endif /* CONFIG_SYNO_BTRFS_SEND */ +#endif /* MY_DEF_HERE */ }; -#ifdef CONFIG_SYNO_BTRFS_SEND +#ifdef MY_DEF_HERE struct btrfs_ioctl_subvol_info_args { /* this root's id */ __u64 root_id; @@ -547,7 +550,7 @@ __u8 puuid[BTRFS_UUID_SIZE]; __u8 ruuid[BTRFS_UUID_SIZE]; }; -#endif /* CONFIG_SYNO_BTRFS_SEND */ +#endif /* MY_DEF_HERE */ /* * Caller doesn't want file data in the send stream, even if the * search of clone sources doesn't find an extent. UPDATE_EXTENT @@ -724,12 +727,12 @@ struct btrfs_ioctl_feature_flags[2]) #define BTRFS_IOC_GET_SUPPORTED_FEATURES _IOR(BTRFS_IOCTL_MAGIC, 57, \ struct btrfs_ioctl_feature_flags[3]) -#ifdef CONFIG_SYNO_BTRFS_SEND +#ifdef MY_DEF_HERE #define BTRFS_IOC_SUBVOL_GETINFO _IOR(BTRFS_IOCTL_MAGIC, 249, \ struct btrfs_ioctl_subvol_info_args) -#endif /* CONFIG_SYNO_BTRFS_SEND */ +#endif /* MY_DEF_HERE */ -#ifdef CONFIG_SYNO_BTRFS_USRQUOTA +#ifdef MY_DEF_HERE #define BTRFS_IOC_USRQUOTA_CTL _IOWR(BTRFS_IOCTL_MAGIC, 250, \ struct btrfs_ioctl_usrquota_ctl_args) #define BTRFS_IOC_USRQUOTA_LIMIT _IOW(BTRFS_IOCTL_MAGIC, 250, \ @@ -741,19 +744,19 @@ #define BTRFS_IOC_USRQUOTA_QUERY _IOR(BTRFS_IOCTL_MAGIC, 252, \ struct btrfs_ioctl_usrquota_query_args) #define BTRFS_IOC_USRQUOTA_CLEAN _IOW(BTRFS_IOCTL_MAGIC, 252, __u64) -#endif /* CONFIG_SYNO_BTRFS_USRQUOTA */ +#endif /* MY_DEF_HERE */ -#ifdef CONFIG_SYNO_BTRFS_QGROUP_QUERY +#ifdef MY_DEF_HERE #define BTRFS_IOC_QGROUP_QUERY _IOR(BTRFS_IOCTL_MAGIC, 253, \ struct btrfs_ioctl_qgroup_query_args) -#endif /* CONFIG_SYNO_BTRFS_QGROUP_QUERY */ +#endif /* MY_DEF_HERE */ -#ifdef CONFIG_SYNO_BTRFS_ERROR_REPORT +#ifdef MY_DEF_HERE #define BTRFS_IOC_CKSUMFAILED_FILES_GET _IOR(BTRFS_IOCTL_MAGIC, 254, \ struct btrfs_ioctl_cksumfailed_files_args) #endif -#if defined(CONFIG_SYNO_BTRFS_COMPR_CTL) || defined(CONFIG_SYNO_HI3535_NVR) +#if defined(MY_DEF_HERE) || defined(MY_ABC_HERE) /* flags for the compression ioctl */ #define BTRFS_COMPR_CTL_SET 0x1 #define BTRFS_COMPR_CTL_COMPR_FL 0x2 @@ -764,11 +767,11 @@ __u64 compressed_size; /* out */ __u64 reserved[1]; }; -#endif /* CONFIG_SYNO_BTRFS_COMPR_CTL || CONFIG_SYNO_HI3535_NVR */ +#endif /* MY_DEF_HERE || MY_ABC_HERE */ -#if defined(CONFIG_SYNO_BTRFS_COMPR_CTL) || defined(CONFIG_SYNO_HI3535_NVR) +#if defined(MY_DEF_HERE) || defined(MY_ABC_HERE) #define BTRFS_IOC_COMPR_CTL _IOR(BTRFS_IOCTL_MAGIC, 248, \ struct btrfs_ioctl_compr_ctl_args) -#endif /* CONFIG_SYNO_BTRFS_COMPR_CTL || CONFIG_SYNO_HI3535_NVR */ +#endif /* MY_DEF_HERE || MY_ABC_HERE */ #endif /* _UAPI_LINUX_BTRFS_H */ diff -ur a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h --- a/include/linux/fsnotify_backend.h 2016-04-25 01:21:54.000000000 +0200 +++ b/include/linux/fsnotify_backend.h 2017-03-23 13:20:39.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /* * Filesystem access notification for Linux * @@ -159,12 +162,12 @@ struct user_struct *user; } inotify_data; #endif -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE struct synotify_group_private_data { struct user_struct *user; unsigned int max_watchers; } synotify_data; -#endif /* CONFIG_SYNO_NOTIFY */ +#endif /* MY_ABC_HERE */ #ifdef CONFIG_FANOTIFY struct fanotify_group_private_data { #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS @@ -237,7 +240,7 @@ #define FSNOTIFY_EVENT_NONE 0 #define FSNOTIFY_EVENT_PATH 1 #define FSNOTIFY_EVENT_INODE 2 -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE #define FSNOTIFY_EVENT_SYNO 3 #endif int data_type; /* which of the above union we have */ @@ -246,11 +249,11 @@ u32 sync_cookie; /* used to corrolate events, namely inotify mv events */ const unsigned char *file_name; -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE const unsigned char *full_name; #endif size_t name_len; -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE size_t full_name_len; #endif struct pid *tgid; @@ -325,7 +328,7 @@ extern void __fsnotify_inode_delete(struct inode *inode); extern void __fsnotify_vfsmount_delete(struct vfsmount *mnt); extern u32 fsnotify_get_cookie(void); -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE extern int SYNOFsnotify(__u32 mask, void *data, int data_is, const unsigned char *file_name, u32 cookie); #endif diff -ur a/include/linux/fsnotify.h b/include/linux/fsnotify.h --- a/include/linux/fsnotify.h 2016-04-25 01:22:09.000000000 +0200 +++ b/include/linux/fsnotify.h 2017-03-23 13:21:06.000000000 +0100 @@ -23,7 +23,7 @@ #include #endif -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE #include #endif @@ -92,7 +92,7 @@ } #endif /* MY_ABC_HERE || MY_ABC_HERE*/ -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE extern int SYNONotify(struct dentry *dentry, __u32 mask); #endif @@ -160,7 +160,7 @@ fsnotify(inode, FS_ATTRIB, inode, FSNOTIFY_EVENT_INODE, NULL, 0); } -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE struct synotify_rename_path { char *old_full_path; char *new_full_path; @@ -172,7 +172,7 @@ /* * fsnotify_move - file old_name at old_dir was moved to new_name at new_dir */ -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir, const unsigned char *old_name, int isdir, struct inode *target, struct dentry *moved, struct synotify_rename_path *path_list) @@ -197,7 +197,7 @@ new_dir_mask |= FS_ISDIR; } -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE /* handle syno notify: * 1. we should check if file/dir moved within same mnt point. If does, we simply * notify a rename event. @@ -282,7 +282,7 @@ SYNO_ArchiveModify(dentry->d_parent->d_inode, 0); #endif -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE SYNONotify(dentry, mask); #endif @@ -309,7 +309,7 @@ SYNO_ArchiveModify(dentry->d_inode, 0); #endif -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE SYNONotify(dentry, FS_CREATE); #endif @@ -326,7 +326,7 @@ fsnotify_link_count(inode); audit_inode_child(new_dentry, dir); -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE SYNONotify(new_dentry, FS_CREATE); #endif fsnotify(dir, FS_CREATE, inode, FSNOTIFY_EVENT_INODE, new_dentry->d_name.name, 0); @@ -346,7 +346,7 @@ SYNO_ArchiveModify(d_inode, 0); #endif -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE SYNONotify(dentry, mask); #endif fsnotify(inode, mask, d_inode, FSNOTIFY_EVENT_INODE, dentry->d_name.name, 0); @@ -442,7 +442,7 @@ #endif fsnotify_parent(NULL, dentry, mask); -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE SYNONotify(dentry, mask); #endif @@ -488,7 +488,7 @@ mask |= FS_ISDIR; fsnotify_parent(NULL, dentry, mask); -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE SYNONotify(dentry, mask); #endif fsnotify(inode, mask, inode, FSNOTIFY_EVENT_INODE, NULL, 0); diff -ur a/include/linux/leds-lp3943.h b/include/linux/leds-lp3943.h --- a/include/linux/leds-lp3943.h 2016-04-25 01:21:58.000000000 +0200 +++ b/include/linux/leds-lp3943.h 2017-03-23 13:20:45.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /* * Copyright 2012 Texas Instruments * @@ -53,9 +56,9 @@ u8 prescale; enum lp3943_led_channel *channel; int num_channels; -#ifdef CONFIG_SYNO_LP3943_FEATURES +#ifdef MY_ABC_HERE char *default_trigger; -#endif // CONFIG_SYNO_LP3943_FEATURES +#endif // MY_ABC_HERE }; /* diff -ur a/include/linux/libata.h b/include/linux/libata.h --- a/include/linux/libata.h 2016-04-25 01:22:36.000000000 +0200 +++ b/include/linux/libata.h 2017-03-23 13:21:47.000000000 +0100 @@ -1067,7 +1067,7 @@ ssize_t (*sw_activity_show)(struct ata_device *dev, char *buf); ssize_t (*sw_activity_store)(struct ata_device *dev, enum sw_activity val); -#ifdef CONFIG_SYNO_HI3535_NVR +#ifdef MY_ABC_HERE ssize_t (*transmit_led_message)(struct ata_port *ap, u32 state, ssize_t size); #endif diff -ur a/include/linux/math64.h b/include/linux/math64.h --- a/include/linux/math64.h 2016-04-25 01:22:06.000000000 +0200 +++ b/include/linux/math64.h 2017-03-23 13:20:59.000000000 +0100 @@ -80,7 +80,7 @@ #endif #ifdef MY_ABC_HERE -#if defined(CONFIG_SYNO_ARMADA) || defined(CONFIG_SYNO_ARMADA_V2) || defined(CONFIG_SYNO_COMCERTO) || (defined(CONFIG_SYNO_X86) && defined(CONFIG_ARCH_GEN3)) || defined(CONFIG_SYNO_ALPINE) || defined(CONFIG_SYNO_HI3535_NVR) +#if defined(MY_DEF_HERE) || defined(MY_DEF_HERE) || defined(MY_DEF_HERE) || (defined(MY_DEF_HERE) && defined(CONFIG_ARCH_GEN3)) || defined(MY_DEF_HERE) || defined(MY_ABC_HERE) static inline u64 mod_u64_rem64(u64 dividend, u64 divisor) { if (dividend < divisor) { @@ -91,7 +91,7 @@ return dividend - (div64_u64(dividend, divisor) * divisor); } -#elif !(defined(CONFIG_SYNO_MV88F6281) || defined(CONFIG_SYNO_MPC8533) || defined(CONFIG_SYNO_MPC854X) || defined(CONFIG_SYNO_QORIQ)) +#elif !(defined(MY_DEF_HERE) || defined(CONFIG_SYNO_MPC8533) || defined(CONFIG_SYNO_MPC854X) || defined(MY_DEF_HERE)) #error "WARNING: possible lack of rem64 ksymbol" #endif #endif diff -ur a/include/linux/namei.h b/include/linux/namei.h --- a/include/linux/namei.h 2016-04-25 01:21:55.000000000 +0200 +++ b/include/linux/namei.h 2017-03-23 13:20:40.000000000 +0100 @@ -111,7 +111,7 @@ extern int follow_down(struct path *); extern int follow_up(struct path *); -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE extern int syno_fetch_mountpoint_fullpath(struct vfsmount *, size_t, char *); #endif diff -ur a/include/linux/netdevice.h b/include/linux/netdevice.h --- a/include/linux/netdevice.h 2016-04-25 01:22:38.000000000 +0200 +++ b/include/linux/netdevice.h 2017-03-23 13:21:51.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /* * INET An implementation of the TCP/IP protocol suite for the LINUX * operating system. INET is implemented using the BSD Socket @@ -2667,7 +2670,7 @@ extern struct pernet_operations __net_initdata loopback_net_ops; -#ifdef CONFIG_SYNO_MAC_ADDRESS +#ifdef MY_ABC_HERE extern int syno_get_dev_vendor_mac(const char *szDev, char *szMac); #endif /* Logging, debugging and troubleshooting/diagnostic helpers. */ diff -ur a/include/linux/sched.h b/include/linux/sched.h --- a/include/linux/sched.h 2016-04-25 01:21:54.000000000 +0200 +++ b/include/linux/sched.h 2017-03-23 13:20:42.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif #ifndef _LINUX_SCHED_H #define _LINUX_SCHED_H @@ -707,7 +710,7 @@ atomic_t inotify_watches; /* How many inotify watches does this user have? */ atomic_t inotify_devs; /* How many inotify devs does this user have opened? */ #endif -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE atomic_t synotify_instances; #endif #ifdef CONFIG_FANOTIFY Nur in a/include/linux: synobios.h. diff -ur a/include/linux/syno.h b/include/linux/syno.h --- a/include/linux/syno.h 2016-04-25 01:22:42.000000000 +0200 +++ b/include/linux/syno.h 2017-03-23 13:21:57.000000000 +0100 @@ -52,7 +52,7 @@ * See bug #26535, #22204, #21688, this is a workaround for factory mis-use 0xF401 in bromolow & pineview as synoboot device * We fix #22204, #21688 first, then create #26535, so further workaround is required */ -#if defined(CONFIG_SYNO_X64) +#if defined(MY_DEF_HERE) #define IS_SYNO_USBBOOT_ID_VENDOR(VENDOR) (0xF400 == (VENDOR) || 0xF401 == (VENDOR)) #define IS_SYNO_USBBOOT_ID_PRODUCT(PRODUCT) (0xF400 == (PRODUCT) || 0xF401 == (PRODUCT)) #else @@ -97,7 +97,7 @@ * Dsc: Support HA Active-Active project. * We need to change synoboot from USB to SATA DOM. */ -#if defined(CONFIG_SYNO_DUAL_HEAD) +#if defined(MY_DEF_HERE) #define SYNO_SATA_DOM_VENDOR_SAMPLE_RUN_2 "SATADOM " #define SYNO_SATA_DOM_MODEL_SAMPLE_RUN_2 "D150SH" #define SYNO_SATA_DOM_VENDOR "SATADOM-" @@ -216,7 +216,7 @@ * following command: * $ cat /proc/sys/kernel/syno_vender_format_version */ -/* #define MY_DEF_HERE */ /* replace with kernel config CONFIG_SYNO_MAC_ADDRESS */ +/* #define MY_DEF_HERE */ /* replace with kernel config MY_ABC_HERE */ /** * Fix: #52055 @@ -243,7 +243,7 @@ /** * Dsc: Support for serial number stored in vender partition */ -/* #define MY_DEF_HERE */ /* replace with kernel config CONFIG_SYNO_SERIAL */ +/* #define MY_DEF_HERE */ /* replace with kernel config MY_ABC_HERE */ /* * Dsc: Pass size of flash memory from uboot or other boot loader. @@ -432,7 +432,7 @@ * Fix: no bug entry * Dsc: switch net device name to collocate with hardware design */ -#if defined(CONFIG_SYNO_MPC854X) || defined(CONFIG_SYNO_X86) || defined(CONFIG_SYNO_X64) || defined(CONFIG_ARCH_FEROCEON) +#if defined(CONFIG_SYNO_MPC854X) || defined(MY_DEF_HERE) || defined(MY_DEF_HERE) || defined(CONFIG_ARCH_FEROCEON) /* #define MY_DEF_HERE */ #ifdef MY_DEF_HERE @@ -709,9 +709,9 @@ * Dsc: This can enhance 10% write performance. * IN : raid5.c, raid5.h */ -#ifdef CONFIG_SYNO_ALPINE -#else /* CONFIG_SYNO_ALPINE */ -#endif /* CONFIG_SYNO_ALPINE */ +#ifdef MY_DEF_HERE +#else /* MY_DEF_HERE */ +#endif /* MY_DEF_HERE */ /** * Fix: DSM4.0 #39585, #39586 @@ -989,7 +989,7 @@ * * User mode "cardreaderd" would poll on external disk only. */ -#if defined(CONFIG_SYNO_X64) && defined(CONFIG_SYNO_BROMOLOW) +#if defined(MY_DEF_HERE) && defined(MY_DEF_HERE) #define SYNO_MAX_INTERNAL_DISK 19 #else #define SYNO_MAX_INTERNAL_DISK 15 @@ -1040,9 +1040,9 @@ * second. * IN : libata-eh.c */ -#ifdef CONFIG_SYNO_AVOTON -#else /* CONFIG_SYNO_AVOTON */ -#endif /* CONFIG_SYNO_AVOTON */ +#ifdef MY_DEF_HERE +#else /* MY_DEF_HERE */ +#endif /* MY_DEF_HERE */ /** * Fix: DS 2.0 #6820 @@ -1173,13 +1173,13 @@ * include/linux/syno.h */ #if defined(MY_ABC_HERE) && defined(MY_ABC_HERE) -#if defined(CONFIG_SYNO_X86) || defined(CONFIG_SYNO_X64) || defined(CONFIG_SYNO_MV88F6281) || defined(SYNO_MARVELL_88F6281) || defined(CONFIG_SYNO_ARMADA) || defined(CONFIG_SYNO_ARMADA_V2) || defined(CONFIG_SYNO_COMCERTO) || defined(CONFIG_SYNO_ALPINE) || defined(CONFIG_SYNO_HI3535_NVR) +#if defined(MY_DEF_HERE) || defined(MY_DEF_HERE) || defined(MY_DEF_HERE) || defined(SYNO_MARVELL_88F6281) || defined(MY_DEF_HERE) || defined(MY_DEF_HERE) || defined(MY_DEF_HERE) || defined(MY_DEF_HERE) || defined(MY_ABC_HERE) #define SYNO_MAX_SATA_ID 20 #define SYNO_PWRPIN_ENCODE_LEN 2 #define SYNO_PORT_SIGN 'N' /* one item is Nxxxx */ #define SYNO_PWRPIN_ITEM_LEN 1 + SYNO_PWRPIN_ENCODE_LEN*2 -#endif /* defined(CONFIG_SYNO_X64) || defined(CONFIG_SYNO_MV88F6281) */ +#endif /* defined(MY_DEF_HERE) || defined(MY_DEF_HERE) */ #endif /* defined(MY_ABC_HERE) && defined(MY_ABC_HERE) */ /** @@ -1496,7 +1496,7 @@ * 8192 limitation: Because of the maximum jbd2 transaction size is 8192 (the volume should more than 8G). */ #if defined(CONFIG_64BIT) || \ - (defined(CONFIG_SYNO_ALPINE) && defined(CONFIG_SYNO_FIX_RESIZE_16TB_IN_32BIT)) + (defined(MY_DEF_HERE) && defined(CONFIG_SYNO_FIX_RESIZE_16TB_IN_32BIT)) /* #define SYNO_RESIZE_INODE_SIZE_EXTEND */ /** * META_BG support for online resize. It is also support flex_bg @@ -1664,7 +1664,7 @@ * Dsc: Don't swap create time into disk if it is big endian machine. * This define should be removed if powerpc/qoriq (behind SYNO_CREATE_TIME_SWAP_VERSION) not support. */ -#if defined(CONFIG_SYNO_MPC8533) || defined(CONFIG_SYNO_QORIQ) +#if defined(CONFIG_SYNO_MPC8533) || defined(MY_DEF_HERE) #ifdef MY_ABC_HERE /* #define MY_DEF_HERE */ #ifdef MY_DEF_HERE @@ -1886,7 +1886,7 @@ * combine ecryptfs and ocf framework. * Only open this function when OCF framework is used. */ -#if defined(CONFIG_SYNO_USE_OCF_LINUX) && !defined(CONFIG_CRYPTO_HW) +#if defined(MY_DEF_HERE) && !defined(CONFIG_CRYPTO_HW) /* #define MY_DEF_HERE */ #endif @@ -1904,9 +1904,9 @@ /** * Dsc: Performance tuning for mv628x. */ -#if defined(CONFIG_MV_XOR_MEMCOPY) && (defined(CONFIG_SYNO_LIO) || defined(MY_ABC_HERE)) +#if defined(CONFIG_MV_XOR_MEMCOPY) && (defined(MY_DEF_HERE) || defined(MY_ABC_HERE)) /* #define SYNO_MV_PERF */ -#endif /* CONFIG_MV_XOR_MEMCOPY && (CONFIG_SYNO_LIO || MY_ABC_HERE) */ +#endif /* CONFIG_MV_XOR_MEMCOPY && (MY_DEF_HERE || MY_ABC_HERE) */ /******************************* Misc. ********************************************/ /** @@ -1956,7 +1956,7 @@ * Fix: #16748 * Dsc: CPU speed adjusting while hibernation */ -#if defined(CONFIG_SYNO_MV88F6281) && !defined(CONFIG_SYNO_MV88F6281_USBSTATION) +#if defined(MY_DEF_HERE) && !defined(CONFIG_SYNO_MV88F6281_USBSTATION) /* #define MY_DEF_HERE */ #endif @@ -1965,7 +1965,7 @@ * Dsc: Force the 2nc CPU core and the logical core derived from the core being offline * IN : drivers/base/cpu.c */ -#if defined(CONFIG_SYNO_X64) +#if defined(MY_DEF_HERE) /* #define MY_DEF_HERE */ #endif @@ -2192,7 +2192,7 @@ * When ECC ram detect 1 bit error, it will correct this error automatically, * but we still need a notification scheme let user know the error just occurred. */ -#if defined(CONFIG_SYNO_X64) || defined(SYNOPLAT_F_X86_64) +#if defined(MY_DEF_HERE) || defined(SYNOPLAT_F_X86_64) /* #define MY_DEF_HERE */ #endif @@ -2205,10 +2205,10 @@ #define SYNO_ISCSI_DEVICE_PREFIX "isd" #define SYNO_ISCSI_DEVICE_INDEX (26 + 25 * 26) // start from za -#if defined(CONFIG_SYNO_ARMADA) || defined(CONFIG_SYNO_ARMADA_V2) +#if defined(MY_DEF_HERE) || defined(MY_DEF_HERE) /* Micro SD is mapped to USB "4-4" */ /* #define SYNO_INTERNAL_MICROSD_NAME "4-4" */ -#endif /* CONFIG_SYNO_ARMADA */ +#endif /* MY_DEF_HERE */ #endif /** @@ -2218,7 +2218,7 @@ * bug the config in linux-2.6.32 didn't add the atomic64 software emu * in ARM arch. */ -#if defined(CONFIG_SYNO_MV88F6281) || defined(SYNO_MARVELL_88F6180) || defined(SYNO_MARVELL_88F6281) +#if defined(MY_DEF_HERE) || defined(SYNO_MARVELL_88F6180) || defined(SYNO_MARVELL_88F6281) /* #define MY_DEF_HERE */ #endif @@ -2422,7 +2422,7 @@ * We add some retry workaround to avoid linkspeed drop and HDD drop * */ -#if defined(CONFIG_SYNO_AVOTON) || defined(CONFIG_SYNO_ALPINE) || defined(CONFIG_ARCH_ARMADA_XP) +#if defined(MY_DEF_HERE) || defined(MY_DEF_HERE) || defined(CONFIG_ARCH_ARMADA_XP) /* #define MY_DEF_HERE */ #endif @@ -2485,8 +2485,8 @@ * SynoEunitFindMaster() would call class_find_device() and making deadlock * We disable irq when SynoEunitFindMaster is running */ -#if defined(MY_ABC_HERE) && defined(CONFIG_SYNO_ALPINE) +#if defined(MY_ABC_HERE) && defined(MY_DEF_HERE) /* #define SYNO_EUNIT_DEADLOCK_FIX */ -#endif /* MY_ABC_HERE && CONFIG_SYNO_ALPINE */ +#endif /* MY_ABC_HERE && MY_DEF_HERE */ #endif /* __SYNO_H_ */ diff -ur a/include/linux/synolib.h b/include/linux/synolib.h --- a/include/linux/synolib.h 2016-04-25 01:21:56.000000000 +0200 +++ b/include/linux/synolib.h 2017-03-23 13:20:42.000000000 +0100 @@ -29,7 +29,7 @@ int SynoSCSIGetDeviceIndex(struct block_device *bdev); #endif -#ifdef CONFIG_SYNO_PLUGIN_INTERFACE +#ifdef MY_ABC_HERE /** * How to use : * 1. module itself register the proprietary instance into the kernel diff -ur a/include/linux/syscalls.h b/include/linux/syscalls.h --- a/include/linux/syscalls.h 2016-04-25 01:22:12.000000000 +0200 +++ b/include/linux/syscalls.h 2017-03-23 13:21:11.000000000 +0100 @@ -910,7 +910,7 @@ /* 421 */ asmlinkage long sys_SYNOLStat(char __user *filename, unsigned int flags, struct SYNOSTAT __user *statbuf); #endif /* BITS_PER_LONG == 32 */ #endif /* MY_ABC_HERE */ -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE /* 422 */ asmlinkage long sys_SYNONotifyInit(unsigned int event_f_flags); /* 423 */ asmlinkage long sys_SYNONotifyAddWatch(int synotify_fd, const char __user *pathname, u64 mask); /* 424 */ asmlinkage long sys_SYNONotifyRemoveWatch(int synotify_fd, const char __user *pathname, u64 mask); @@ -918,7 +918,7 @@ /* 425 */ asmlinkage long sys_SYNONotifyAddWatch32(int synotify_fd, const char __user *pathname, u32 mask); /* 426 */ asmlinkage long sys_SYNONotifyRemoveWatch32(int synotify_fd, const char __user *pathname, u32 mask); #endif /* BITS_PER_LONG == 32 */ -#endif /* CONFIG_SYNO_NOTIFY */ +#endif /* MY_ABC_HERE */ #ifdef MY_ABC_HERE /* 427 */ asmlinkage long sys_SYNOArchiveOverwrite(unsigned int fd, unsigned int flags); #endif /* MY_ABC_HERE */ diff -ur a/include/linux/sysctl.h b/include/linux/sysctl.h --- a/include/linux/sysctl.h 2016-04-25 01:22:05.000000000 +0200 +++ b/include/linux/sysctl.h 2017-03-23 13:20:58.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /* * sysctl.h: General linux system control interface * @@ -959,7 +962,7 @@ void __user *, size_t *, loff_t *); extern int proc_do_large_bitmap(struct ctl_table *, int, void __user *, size_t *, loff_t *); -#ifdef CONFIG_SYNO_MAC_ADDRESS +#ifdef MY_ABC_HERE extern int SynoProcDoStringVec(struct ctl_table *, int, void __user *, size_t *, loff_t *); #endif diff -ur a/kernel/audit_watch.c b/kernel/audit_watch.c --- a/kernel/audit_watch.c 2016-04-25 01:07:00.000000000 +0200 +++ b/kernel/audit_watch.c 2017-03-23 12:50:33.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /* audit_watch.c -- watching inodes * * Copyright 2003-2009 Red Hat, Inc. @@ -486,7 +489,7 @@ struct fsnotify_mark *vfsmount_mark, __u32 mask, void *data, int data_type) { -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE /* Don't care syno notify event, because latter will be FSNOTIFY_EVENT_PATH or FSNOTIFY_EVENT_INODE coming up */ if (data_type == FSNOTIFY_EVENT_SYNO) return false; @@ -505,7 +508,7 @@ const char *dname = event->file_name; struct audit_parent *parent; -#ifdef CONFIG_SYNO_NOTIFY +#ifdef MY_ABC_HERE if (FSNOTIFY_EVENT_SYNO == event->data_type) return 0; #endif diff -ur a/kernel/sys.c b/kernel/sys.c --- a/kernel/sys.c 2016-04-25 01:07:01.000000000 +0200 +++ b/kernel/sys.c 2017-03-23 12:50:37.000000000 +0100 @@ -380,7 +380,7 @@ #ifdef MY_ABC_HERE extern int gSynoSystemShutdown; -#endif /* CONFIG_SYNO_ATA_SHUTDOWN_FIX */ +#endif /* MY_DEF_HERE */ static void kernel_shutdown_prepare(enum system_states state) { blocking_notifier_call_chain(&reboot_notifier_list, diff -ur a/kernel/sysctl.c b/kernel/sysctl.c --- a/kernel/sysctl.c 2016-04-25 01:07:07.000000000 +0200 +++ b/kernel/sysctl.c 2017-03-23 12:50:45.000000000 +0100 @@ -187,7 +187,7 @@ EXPORT_SYMBOL(giDiskSeqReverse); #endif -#ifdef CONFIG_SYNO_MAC_ADDRESS +#ifdef MY_ABC_HERE unsigned char grgbLanMac[CONFIG_SYNO_MAC_IF][16]; EXPORT_SYMBOL(grgbLanMac); int giVenderFormatVersion = 1; @@ -198,7 +198,7 @@ int grgPwrCtlPin[SYNO_MAX_SATA_ID] = {0}; #endif -#ifdef CONFIG_SYNO_SERIAL +#ifdef MY_ABC_HERE char gszSerialNum[12]; EXPORT_SYMBOL(gszSerialNum); char gszCustomSerialNum[32]; @@ -217,7 +217,7 @@ #endif -#ifdef CONFIG_SYNO_DISPLAY_CPUINFO +#ifdef MY_ABC_HERE unsigned int gSynoCPUInfoCore = 0; EXPORT_SYMBOL(gSynoCPUInfoCore); char gSynoCPUInfoClock[16]; @@ -229,7 +229,7 @@ EXPORT_SYMBOL(gSynoFactoryUSBFastReset); #endif -#ifdef CONFIG_SYNO_FACTORY_USB3_DISABLE +#ifdef MY_ABC_HERE int gSynoFactoryUSB3Disable = 0; EXPORT_SYMBOL(gSynoFactoryUSB3Disable); #endif @@ -287,7 +287,7 @@ static int __maybe_unused three = 3; static unsigned long one_ul = 1; static int one_hundred = 100; -#ifdef CONFIG_SYNO_MAC_ADDRESS +#ifdef MY_ABC_HERE static int iSynoMacMaxV2 = CONFIG_SYNO_MAC_IF; static int iMacEntrySize = 16; #endif @@ -1156,7 +1156,7 @@ .proc_handler = proc_dointvec, }, #endif -#ifdef CONFIG_SYNO_FACTORY_USB3_DISABLE +#ifdef MY_ABC_HERE { .procname = "syno_disable_usb3", .data = &gSynoFactoryUSB3Disable, @@ -1256,7 +1256,7 @@ .proc_handler = &proc_dointvec, }, #endif -#ifdef CONFIG_SYNO_MAC_ADDRESS +#ifdef MY_ABC_HERE { .procname = "syno_mac_address1", .data = &grgbLanMac[0], @@ -1302,7 +1302,7 @@ .proc_handler = &proc_dointvec, }, #endif -#ifdef CONFIG_SYNO_SERIAL +#ifdef MY_ABC_HERE { .procname = "syno_serial", .data = &gszSerialNum, @@ -1345,7 +1345,7 @@ .proc_handler = &proc_dointvec, }, #endif -#ifdef CONFIG_SYNO_DISPLAY_CPUINFO +#ifdef MY_ABC_HERE { .procname = "syno_CPU_info_core", .data = &gSynoCPUInfoCore, @@ -2846,7 +2846,7 @@ } } -#if defined(CONFIG_SYNO_MAC_ADDRESS) +#if defined(MY_ABC_HERE) /** * Notice: In order to call this handler, the input array of strings * must be in continuous memory allocation @@ -2921,7 +2921,7 @@ return 0; } -#endif /* CONFIG_SYNO_MAC_ADDRESS */ +#endif /* MY_ABC_HERE */ #else /* CONFIG_PROC_SYSCTL */ @@ -2974,7 +2974,7 @@ return -ENOSYS; } -#if defined(CONFIG_SYNO_MAC_ADDRESS) +#if defined(MY_ABC_HERE) int SynoProcDoStringVec(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { diff -ur a/net/core/dev.c b/net/core/dev.c --- a/net/core/dev.c 2016-04-25 01:08:11.000000000 +0200 +++ b/net/core/dev.c 2017-03-23 12:52:02.000000000 +0100 @@ -147,7 +147,7 @@ /* This should be increased if a protocol with a bigger head is added. */ #define GRO_MAX_HEAD (MAX_HEADER + 128) -#ifdef CONFIG_SYNO_MAC_ADDRESS +#ifdef MY_ABC_HERE static unsigned int str_to_hex( char ch ) { if( (ch >= '0') && (ch <= '9') ) @@ -5905,7 +5905,7 @@ } else { netdev_stats_to_stats64(storage, &dev->stats); } -#ifndef CONFIG_SYNO_SKIP_RXDROP_BY_CORE +#ifndef MY_ABC_HERE storage->rx_dropped += atomic_long_read(&dev->rx_dropped); #endif return storage; diff -ur a/net/ethernet/eth.c b/net/ethernet/eth.c --- a/net/ethernet/eth.c 2016-04-25 01:08:25.000000000 +0200 +++ b/net/ethernet/eth.c 2017-03-23 12:52:15.000000000 +0100 @@ -1,3 +1,6 @@ +#ifndef MY_ABC_HERE +#define MY_ABC_HERE +#endif /* * INET An implementation of the TCP/IP protocol suite for the LINUX * operating system. INET is implemented using the BSD Socket @@ -282,7 +285,7 @@ { struct sockaddr *addr = p; -#ifndef CONFIG_SYNO_MAC_ADDRESS +#ifndef MY_ABC_HERE if (netif_running(dev)) return -EBUSY; #endif diff -ur a/net/ipv4/tcp.c b/net/ipv4/tcp.c --- a/net/ipv4/tcp.c 2016-04-25 01:07:55.000000000 +0200 +++ b/net/ipv4/tcp.c 2017-03-23 12:51:33.000000000 +0100 @@ -1538,7 +1538,7 @@ timeo = sock_rcvtimeo(sk, nonblock); /* in some case, i.e. afp stress, we need more time to received data */ -#ifdef CONFIG_SYNO_HI3535_NVR +#ifdef MY_ABC_HERE if (flags & MSG_WAITALL) { timeo <= 1; /* timeo = timeo * 2 */ } diff -ur a/synoconfigs/hi3535 b/synoconfigs/hi3535 --- a/synoconfigs/hi3535 2015-11-05 09:21:43.000000000 +0100 +++ b/synoconfigs/hi3535 2016-11-03 19:16:51.000000000 +0100 @@ -36,7 +36,7 @@ # CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_CROSS_COMPILE="" +CONFIG_CROSS_COMPILE="/usr/local/arm-cortexa9-linux-gnueabi/bin/arm-cortexa9-linux-gnueabi-" CONFIG_LOCALVERSION="_hi3535" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y diff -ur a/synoconfigs/Kconfig b/synoconfigs/Kconfig --- a/synoconfigs/Kconfig 2015-10-21 10:46:48.000000000 +0200 +++ b/synoconfigs/Kconfig 2017-03-23 17:39:21.000000000 +0100 @@ -8,41 +8,25 @@ bool "Customized features of LP3943 led dirver for Synology Corp. NAS product" depends on LEDS_LP3943 default n - help - Set to yes to enable customize features for Synology NAS product - Including i2c board info and led default trigger setting config SYNO_FORCE_EH_FULL_RECOVER_RETRY bool "Force to reset all links of a PMP while retrying EH recover" default y - help - The EH recover will not clean the flags of the rested link if an error occurred on an frozen port. - This could leads to port dysfunction, so we add this fix to prevent the PMP SATA ports from improper initializing. - Set to Y if you want to enable it. config SYNO_DISPLAY_CPUINFO bool "Support display CPU Infomation" - help - Say Y to Support display CPU Infomation config SYNO_GPIO_DEVICE depends on SYNO_HI3535_NVR bool "add a fake gpio device for gpio library." - help - We need to add a fake gpio device and gpio driver for gpiolib - and then we can enable gpio_i2c. config SYNO_I2C_DEVICE depends on SYNO_HI3535_NVR && SYNO_GPIO_DEVICE bool "enable I2C by GPIO simulated" - help - enable I2C by GPIO simulated config SYNO_FIX_THERMAL_SENSOR depends on SYNO_I2C_DEVICE bool "fix LM75 nack issue" - help - pull up sda before send/read will cause LM75 return NACK config SYNO_HI3535_SUPPORT_WOL bool "Enable Wake On LAN on hi3535 platform" @@ -58,26 +42,14 @@ bool "Reverse brightness setting" depends on SYNO_LP3943_FEATURES default y - help - No Bug Entry - It's a work around for HW designed. - change the brightness setting to: 0 = LED ON, 255 = LED OFF config SYNO_ENABLE_USBFS_ENTRY bool "Add USB entry to /proc/bus" default y - help - N/A - We find USBFS "/proc/bus/usb" is removed. - However; user space programs still need it, so we create the entry to regenerate USBFS. config SYNO_INCREASE_SKB_SIZE bool "Increase skb size to 2K" default y depends on SYNO_HI3535_NVR - help - 85948 - We find that STM mac receive packets which size is large than mtu 1500. - It will make skb_put trigger skb_over_panic. This config increase skb size to 2K. endmenu