Author: arekm Date: Sat Oct 23 13:23:54 2010 GMT Module: packages Tag: HEAD ---- Log message: - drop obsolete ppc files; fix endif
---- Files affected: packages/kernel: kernel-small_fixes.patch (1.11 -> 1.12) , kernel.spec (1.849 -> 1.850) , kernel-ppc-ICE-hacks.patch (1.2 -> NONE) (REMOVED), kernel-ppc-crtsavres.patch (1.3 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/kernel/kernel-small_fixes.patch diff -u packages/kernel/kernel-small_fixes.patch:1.11 packages/kernel/kernel-small_fixes.patch:1.12 --- packages/kernel/kernel-small_fixes.patch:1.11 Wed Oct 20 21:07:36 2010 +++ packages/kernel/kernel-small_fixes.patch Sat Oct 23 15:23:48 2010 @@ -78,3 +78,41 @@ /* Some toolchains use a `_' prefix for all user symbols. */ +commit 87b09f1f25cd1e01d7c50bf423c7fe33027d7511 +Author: stephen hemminger <[email protected]> +Date: Fri Feb 12 06:58:00 2010 +0000 + + sky2: dont enable PME legacy mode + + This bit is not changed by vendor driver, and should be left alone. + The documentation implies this a debug bit. + 0 = WAKE# only asserted when VMAIN not available + 1 = WAKE# is depend on wake events and independent of VMAIN. + + Signed-off-by: Stephen Hemminger <[email protected]> + Signed-off-by: David S. Miller <[email protected]> + +diff --git b/drivers/net/sky2.c a/drivers/net/sky2.c +index 2494842..edf37aa 100644 +--- b/drivers/net/sky2.c ++++ a/drivers/net/sky2.c +@@ -733,6 +733,7 @@ static void sky2_wol_init(struct sky2_port *sky2) + unsigned port = sky2->port; + enum flow_control save_mode; + u16 ctrl; ++ u32 reg1; + + /* Bring hardware out of reset */ + sky2_write16(hw, B0_CTST, CS_RST_CLR); +@@ -786,6 +787,11 @@ static void sky2_wol_init(struct sky2_port *sky2) + /* Disable PiG firmware */ + sky2_write16(hw, B0_CTST, Y2_HW_WOL_OFF); + ++ /* Turn on legacy PCI-Express PME mode */ ++ reg1 = sky2_pci_read32(hw, PCI_DEV_REG1); ++ reg1 |= PCI_Y2_PME_LEGACY; ++ sky2_pci_write32(hw, PCI_DEV_REG1, reg1); ++ + /* block receiver */ + sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET); + } ================================================================ Index: packages/kernel/kernel.spec diff -u packages/kernel/kernel.spec:1.849 packages/kernel/kernel.spec:1.850 --- packages/kernel/kernel.spec:1.849 Sat Oct 23 15:04:21 2010 +++ packages/kernel/kernel.spec Sat Oct 23 15:23:48 2010 @@ -269,10 +269,6 @@ Patch147: kernel-aufs2-no-const-grsec.patch Patch148: kernel-aufs2-reiser4.patch -Patch150: kernel-ppc-crtsavres.patch - -Patch200: kernel-ppc-ICE-hacks.patch - # Show normal colors in menuconfig with ncurses ABI 6 Patch250: kernel-fix_256colors_menuconfig.patch @@ -795,20 +791,12 @@ %{?with_vserver:%patch10001 -p1} %{?with_vserver:%patch10002 -p1} %endif -%endif # # end of grsecurity & pax stuff # apparmor %patch5000 -p1 -# FIXME -#%patch150 -p1 - -%ifarch ppc ppc64 -#patch200 -p1 -%endif - %patch250 -p1 # routes @@ -1540,6 +1528,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.850 2010/10/23 13:23:48 arekm +- drop obsolete ppc files; fix endif + Revision 1.849 2010/10/23 13:04:21 baggins - cut down changelog ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-small_fixes.patch?r1=1.11&r2=1.12&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.849&r2=1.850&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
