Changeset 37275


Ignore:
Timestamp:
2013-07-14T00:45:09+02:00 (5 years ago)
Author:
hauke
Message:

kernel: update to kernel 3.10.1 and refresh patches

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/kernel-version.mk

    r37274 r37275  
    1818  LINUX_KERNEL_MD5SUM:=2d69615f7074b952cfcb65f1356c0cc9 
    1919endif 
    20 ifeq ($(LINUX_VERSION),3.10) 
    21   LINUX_KERNEL_MD5SUM:=4f25cd5bec5f8d5a7d935b3f2ccb8481 
     20ifeq ($(LINUX_VERSION),3.10.1) 
     21  LINUX_KERNEL_MD5SUM:=4c8ed240943c8750a89cc307637bd74d 
    2222endif 
    2323 
  • trunk/target/linux/bcm53xx/Makefile

    r37268 r37275  
    1313MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de> 
    1414 
    15 LINUX_VERSION:=3.10 
     15LINUX_VERSION:=3.10.1 
    1616 
    1717include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/brcm2708/Makefile

    r37220 r37275  
    1414MAINTAINER:=Florian Fainelli <florian@openwrt.org> 
    1515 
    16 LINUX_VERSION:=3.10 
     16LINUX_VERSION:=3.10.1 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/generic/patches-3.10/204-module_strip.patch

    r37255 r37275  
    7979 #define __MODULE_INFO(tag, name, info)                                   \ 
    8080 static const char __UNIQUE_ID(name)[]                                    \ 
    81 @@ -23,8 +33,7 @@ static const char __UNIQUE_ID(name)[]                  
     81@@ -23,8 +33,7 @@ static const char __UNIQUE_ID(name)[] 
    8282   = __stringify(tag) "=" info 
    8383 #else  /* !MODULE */ 
     
    8989 #define __MODULE_PARM_TYPE(name, _type)                                          \ 
    9090   __MODULE_INFO(parmtype, name##type, #name ":" _type) 
    91 @@ -32,7 +41,7 @@ static const char __UNIQUE_ID(name)[]                  
     91@@ -32,7 +41,7 @@ static const char __UNIQUE_ID(name)[] 
    9292 /* One for each parameter, describing how to use it.  Some files do 
    9393    multiple of these per line, so can't just use MODULE_INFO. */ 
  • trunk/target/linux/generic/patches-3.10/531-debloat_lzma.patch

    r37211 r37275  
    125125--- a/lib/lzma/LzmaDec.c 
    126126+++ b/lib/lzma/LzmaDec.c 
    127 @@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p,  
     127@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p, 
    128128   p->needFlush = 0; 
    129129 } 
     
    220220   UInt32 dicSize; 
    221221   Byte d; 
    222 @@ -935,33 +883,11 @@ static SRes LzmaDec_AllocateProbs2(CLzma 
     222@@ -935,7 +883,7 @@ static SRes LzmaDec_AllocateProbs2(CLzma 
    223223   return SZ_OK; 
    224224 } 
    225225  
    226226-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) 
     227+static SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) 
     228 { 
     229   CLzmaProps propNew; 
     230   RINOK(LzmaProps_Decode(&propNew, props, propsSize)); 
     231@@ -943,28 +891,6 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p, 
     232   p->prop = propNew; 
     233   return SZ_OK; 
     234 } 
     235- 
     236-SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) 
    227237-{ 
    228238-  CLzmaProps propNew; 
     239-  SizeT dicBufSize; 
    229240-  RINOK(LzmaProps_Decode(&propNew, props, propsSize)); 
    230241-  RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc)); 
    231 -  p->prop = propNew; 
    232 -  return SZ_OK; 
    233 -} 
    234 - 
    235 -SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) 
    236 +static SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) 
    237  { 
    238    CLzmaProps propNew; 
    239 -  SizeT dicBufSize; 
    240    RINOK(LzmaProps_Decode(&propNew, props, propsSize)); 
    241    RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc)); 
    242242-  dicBufSize = propNew.dicSize; 
    243243-  if (p->dic == 0 || dicBufSize != p->dicBufSize) 
     
    252252-  } 
    253253-  p->dicBufSize = dicBufSize; 
    254    p->prop = propNew; 
    255    return SZ_OK; 
    256  } 
     254-  p->prop = propNew; 
     255-  return SZ_OK; 
     256-} 
     257  
     258 SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, 
     259     const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode, 
    257260--- a/include/linux/lzma/LzmaEnc.h 
    258261+++ b/include/linux/lzma/LzmaEnc.h 
     
    598601  
    599602 /* Conditions: 
    600 @@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p,  
     603@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p, 
    601604     UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter, 
    602605     ISzAlloc *alloc); 
     
    687690   memmove(p->bufferBase, 
    688691     p->buffer - p->keepSizeBefore, 
    689 @@ -97,22 +103,14 @@ void MatchFinder_MoveBlock(CMatchFinder  
     692@@ -97,22 +103,14 @@ void MatchFinder_MoveBlock(CMatchFinder 
    690693   p->buffer = p->bufferBase + p->keepSizeBefore; 
    691694 } 
  • trunk/target/linux/imx23/Makefile

    r37175 r37275  
    1313CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -fno-caller-saves 
    1414MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu> 
    15 LINUX_VERSION:=3.10 
     15LINUX_VERSION:=3.10.1 
    1616KERNELNAME:="zImage dtbs" 
    1717#DEPENDS:=+imx-bootlets 
  • trunk/target/linux/imx6/Makefile

    r37116 r37275  
    1414MAINTAINER:=Luka Perkov <luka@openwrt.org> 
    1515 
    16 LINUX_VERSION:=3.10 
     16LINUX_VERSION:=3.10.1 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/ixp4xx/Makefile

    r37153 r37275  
    1414SUBTARGETS=generic harddisk 
    1515 
    16 LINUX_VERSION:=3.10 
     16LINUX_VERSION:=3.10.1 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
Note: See TracChangeset for help on using the changeset viewer.