From 170c29c503c844ca693e28ebb9e1bf376e9053f2 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Sat, 18 Apr 2009 17:42:19 +0200 Subject: [PATCH] --- yaml --- r: 143681 b: refs/heads/master c: c018f1ee5cf81e58b93d9e93a2ee39cad13dc1ac h: refs/heads/master i: 143679: 8eff933d57f48405d29fe56f905efa55e1ae8087 v: v3 --- [refs] | 2 +- trunk/Documentation/kernel-parameters.txt | 38 ----------------------- trunk/drivers/ide/hpt366.c | 4 ++- trunk/mm/vmscan.c | 5 ++- trunk/security/smack/smack_lsm.c | 11 +++---- 5 files changed, 11 insertions(+), 49 deletions(-) diff --git a/[refs] b/[refs] index d825be2396b3..5939bf3eae8c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62f2730a11b6fbd6ac274dcf1bc8251abe8d2205 +refs/heads/master: c018f1ee5cf81e58b93d9e93a2ee39cad13dc1ac diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 600cdd72900c..a19f021f081a 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -231,35 +231,6 @@ and is between 256 and 4096 characters. It is defined in the file power state again in power transition. 1 : disable the power state check - acpi_sci= [HW,ACPI] ACPI System Control Interrupt trigger mode - Format: { level | edge | high | low } - - acpi_serialize [HW,ACPI] force serialization of AML methods - - acpi_skip_timer_override [HW,ACPI] - Recognize and ignore IRQ0/pin2 Interrupt Override. - For broken nForce2 BIOS resulting in XT-PIC timer. - - acpi_sleep= [HW,ACPI] Sleep options - Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig, - old_ordering, s4_nonvs } - See Documentation/power/video.txt for information on - s3_bios and s3_mode. - s3_beep is for debugging; it makes the PC's speaker beep - as soon as the kernel's real-mode entry point is called. - s4_nohwsig prevents ACPI hardware signature from being - used during resume from hibernation. - old_ordering causes the ACPI 1.0 ordering of the _PTS - control method, with respect to putting devices into - low power states, to be enforced (the ACPI 2.0 ordering - of _PTS is used by default). - s4_nonvs prevents the kernel from saving/restoring the - ACPI NVS memory during hibernation. - - acpi_use_timer_override [HW,ACPI] - Use timer override. For some broken Nvidia NF5 boards - that require a timer override, but don't have HPET - acpi_enforce_resources= [ACPI] { strict | lax | no } Check for resource conflicts between native drivers @@ -279,9 +250,6 @@ and is between 256 and 4096 characters. It is defined in the file ad1848= [HW,OSS] Format: ,,,, - add_efi_memmap [EFI; X86] Include EFI memory map in - kernel's map of available physical RAM. - advansys= [HW,SCSI] See header of drivers/scsi/advansys.c. @@ -1870,12 +1838,6 @@ and is between 256 and 4096 characters. It is defined in the file autoconfiguration. Ranges are in pairs (memory base and size). - ports= [IP_VS_FTP] IPVS ftp helper module - Default is 21. - Up to 8 (IP_VS_APP_MAX_PORTS) ports - may be specified. - Format: ,.... - print-fatal-signals= [KNL] debug: print fatal signals print-fatal-signals=1: print segfault info to diff --git a/trunk/drivers/ide/hpt366.c b/trunk/drivers/ide/hpt366.c index a0eb87f59134..cea1ac222a90 100644 --- a/trunk/drivers/ide/hpt366.c +++ b/trunk/drivers/ide/hpt366.c @@ -114,6 +114,8 @@ * the register setting lists into the table indexed by the clock selected * - set the correct hwif->ultra_mask for each individual chip * - add Ultra and MW DMA mode filtering for the HPT37[24] based SATA cards + * - stop resetting HPT370's state machine before each DMA transfer as that has + * caused more harm than good * Sergei Shtylyov, or */ @@ -133,7 +135,7 @@ #define DRV_NAME "hpt366" /* various tuning parameters */ -#define HPT_RESET_STATE_ENGINE +#undef HPT_RESET_STATE_ENGINE #undef HPT_DELAY_INTERRUPT static const char *quirk_drives[] = { diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index 99155b7b8123..39fdfb14eeaa 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/mm/vmscan.c @@ -2088,13 +2088,13 @@ static void shrink_all_zones(unsigned long nr_pages, int prio, nr_reclaimed += shrink_list(l, nr_to_scan, zone, sc, prio); if (nr_reclaimed >= nr_pages) { - sc->nr_reclaimed += nr_reclaimed; + sc->nr_reclaimed = nr_reclaimed; return; } } } } - sc->nr_reclaimed += nr_reclaimed; + sc->nr_reclaimed = nr_reclaimed; } /* @@ -2115,7 +2115,6 @@ unsigned long shrink_all_memory(unsigned long nr_pages) .may_unmap = 0, .may_writepage = 1, .isolate_pages = isolate_pages_global, - .nr_reclaimed = 0, }; current->reclaim_state = &reclaim_state; diff --git a/trunk/security/smack/smack_lsm.c b/trunk/security/smack/smack_lsm.c index 98b3195347ab..921514902eca 100644 --- a/trunk/security/smack/smack_lsm.c +++ b/trunk/security/smack/smack_lsm.c @@ -609,12 +609,8 @@ static int smack_inode_setxattr(struct dentry *dentry, const char *name, strcmp(name, XATTR_NAME_SMACKIPOUT) == 0) { if (!capable(CAP_MAC_ADMIN)) rc = -EPERM; - /* - * check label validity here so import wont fail on - * post_setxattr - */ - if (size == 0 || size >= SMK_LABELLEN || - smk_import(value, size) == NULL) + /* a label cannot be void and cannot begin with '-' */ + if (size == 0 || (size > 0 && ((char *)value)[0] == '-')) rc = -EINVAL; } else rc = cap_inode_setxattr(dentry, name, value, size, flags); @@ -648,6 +644,9 @@ static void smack_inode_post_setxattr(struct dentry *dentry, const char *name, if (strcmp(name, XATTR_NAME_SMACK)) return; + if (size >= SMK_LABELLEN) + return; + isp = dentry->d_inode->i_security; /*