This repository has been archived by the owner on Jul 13, 2022. It is now read-only.
forked from intervigilium/android_kernel_htc_msm8660
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This is the 3.0.47 stable release * tag 'v3.0.47': Linux 3.0.47 ALSA: emu10k1: add chip details for E-mu 1010 PCIe card ALSA: ac97 - Fix missing NULL check in snd_ac97_cvol_new() udf: fix retun value on error path in udf_load_logicalvol tpm: Propagate error from tpm_transmit to fix a timeout hang x86, random: Verify RDRAND functionality and allow it to be disabled x86, random: Architectural inlines to get random integers with RDRAND jbd: Fix assertion failure in commit code due to lacking transaction credits drm/radeon: Don't destroy I2C Bus Rec in radeon_ext_tmds_enc_destroy(). Add CDC-ACM support for the CX93010-2x UCMxx USB Modem netfilter: xt_limit: have r->cost != 0 case work netfilter: limit, hashlimit: avoid duplicated inline netfilter: nf_ct_expect: fix possible access to uninitialized timer netfilter: nf_nat_sip: fix via header translation with multiple parameters ipvs: fix oops on NAT reply in br_nf context netfilter: nf_nat_sip: fix incorrect handling of EBUSY for RTCP expectation netfilter: nf_ct_ipv4: packets with wrong ihl are invalid netfilter: nf_conntrack: fix racy timer handling with reliable events ipvs: fix oops in ip_vs_dst_event on rmmod tg3: Apply short DMA frag workaround to 5906 pktgen: fix crash when generating IPv6 packets timers: Fix endless looping between cascade() and internal_add_timer() viafb: don't touch clock state on OLPC XO-1.5 video/udlfb: fix line counting in fb_write module: taint kernel when lve module is loaded autofs4 - fix reset pending flag on mount fail block: fix request_queue->flags initialization xen/bootup: allow read_tscp call for Xen PV guests. xen/bootup: allow {read|write}_cr8 pvops call. SUNRPC: Ensure that the TCP socket is closed when in CLOSE_WAIT firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel) ARM: 7541/1: Add ARM ERRATA 775420 workaround tmpfs,ceph,gfs2,isofs,reiserfs,xfs: fix fh_len checking mips,kgdb: fix recursive page fault with CONFIG_KPROBES ACPI: EC: Add a quirk for CLEVO M720T/M730T laptop ACPI: EC: Make the GPE storm threshold a module parameter lockd: use rpc client's cl_nodename for id encoding ARM: vfp: fix saving d16-d31 vfp registers on v6+ kernels Conflicts: net/netfilter/nf_conntrack_expect.c
- Loading branch information
Showing
47 changed files
with
480 additions
and
109 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
VERSION = 3 | ||
PATCHLEVEL = 0 | ||
SUBLEVEL = 46 | ||
SUBLEVEL = 47 | ||
EXTRAVERSION = | ||
NAME = Sneaky Weasel | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
/* | ||
* This file is part of the Linux kernel. | ||
* | ||
* Copyright (c) 2011, Intel Corporation | ||
* Authors: Fenghua Yu <fenghua.yu@intel.com>, | ||
* H. Peter Anvin <hpa@linux.intel.com> | ||
* | ||
* This program is free software; you can redistribute it and/or modify it | ||
* under the terms and conditions of the GNU General Public License, | ||
* version 2, as published by the Free Software Foundation. | ||
* | ||
* This program is distributed in the hope it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
* more details. | ||
* | ||
* You should have received a copy of the GNU General Public License along with | ||
* this program; if not, write to the Free Software Foundation, Inc., | ||
* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
*/ | ||
|
||
#ifndef ASM_X86_ARCHRANDOM_H | ||
#define ASM_X86_ARCHRANDOM_H | ||
|
||
#include <asm/processor.h> | ||
#include <asm/cpufeature.h> | ||
#include <asm/alternative.h> | ||
#include <asm/nops.h> | ||
|
||
#define RDRAND_RETRY_LOOPS 10 | ||
|
||
#define RDRAND_INT ".byte 0x0f,0xc7,0xf0" | ||
#ifdef CONFIG_X86_64 | ||
# define RDRAND_LONG ".byte 0x48,0x0f,0xc7,0xf0" | ||
#else | ||
# define RDRAND_LONG RDRAND_INT | ||
#endif | ||
|
||
#ifdef CONFIG_ARCH_RANDOM | ||
|
||
#define GET_RANDOM(name, type, rdrand, nop) \ | ||
static inline int name(type *v) \ | ||
{ \ | ||
int ok; \ | ||
alternative_io("movl $0, %0\n\t" \ | ||
nop, \ | ||
"\n1: " rdrand "\n\t" \ | ||
"jc 2f\n\t" \ | ||
"decl %0\n\t" \ | ||
"jnz 1b\n\t" \ | ||
"2:", \ | ||
X86_FEATURE_RDRAND, \ | ||
ASM_OUTPUT2("=r" (ok), "=a" (*v)), \ | ||
"0" (RDRAND_RETRY_LOOPS)); \ | ||
return ok; \ | ||
} | ||
|
||
#ifdef CONFIG_X86_64 | ||
|
||
GET_RANDOM(arch_get_random_long, unsigned long, RDRAND_LONG, ASM_NOP5); | ||
GET_RANDOM(arch_get_random_int, unsigned int, RDRAND_INT, ASM_NOP4); | ||
|
||
#else | ||
|
||
GET_RANDOM(arch_get_random_long, unsigned long, RDRAND_LONG, ASM_NOP3); | ||
GET_RANDOM(arch_get_random_int, unsigned int, RDRAND_INT, ASM_NOP3); | ||
|
||
#endif /* CONFIG_X86_64 */ | ||
|
||
#endif /* CONFIG_ARCH_RANDOM */ | ||
|
||
extern void x86_init_rdrand(struct cpuinfo_x86 *c); | ||
|
||
#endif /* ASM_X86_ARCHRANDOM_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
/* | ||
* This file is part of the Linux kernel. | ||
* | ||
* Copyright (c) 2011, Intel Corporation | ||
* Authors: Fenghua Yu <fenghua.yu@intel.com>, | ||
* H. Peter Anvin <hpa@linux.intel.com> | ||
* | ||
* This program is free software; you can redistribute it and/or modify it | ||
* under the terms and conditions of the GNU General Public License, | ||
* version 2, as published by the Free Software Foundation. | ||
* | ||
* This program is distributed in the hope it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
* more details. | ||
* | ||
* You should have received a copy of the GNU General Public License along with | ||
* this program; if not, write to the Free Software Foundation, Inc., | ||
* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
*/ | ||
|
||
#include <asm/processor.h> | ||
#include <asm/archrandom.h> | ||
#include <asm/sections.h> | ||
|
||
static int __init x86_rdrand_setup(char *s) | ||
{ | ||
setup_clear_cpu_cap(X86_FEATURE_RDRAND); | ||
return 1; | ||
} | ||
__setup("nordrand", x86_rdrand_setup); | ||
|
||
/* We can't use arch_get_random_long() here since alternatives haven't run */ | ||
static inline int rdrand_long(unsigned long *v) | ||
{ | ||
int ok; | ||
asm volatile("1: " RDRAND_LONG "\n\t" | ||
"jc 2f\n\t" | ||
"decl %0\n\t" | ||
"jnz 1b\n\t" | ||
"2:" | ||
: "=r" (ok), "=a" (*v) | ||
: "0" (RDRAND_RETRY_LOOPS)); | ||
return ok; | ||
} | ||
|
||
/* | ||
* Force a reseed cycle; we are architecturally guaranteed a reseed | ||
* after no more than 512 128-bit chunks of random data. This also | ||
* acts as a test of the CPU capability. | ||
*/ | ||
#define RESEED_LOOP ((512*128)/sizeof(unsigned long)) | ||
|
||
void __cpuinit x86_init_rdrand(struct cpuinfo_x86 *c) | ||
{ | ||
#ifdef CONFIG_ARCH_RANDOM | ||
unsigned long tmp; | ||
int i, count, ok; | ||
|
||
if (!cpu_has(c, X86_FEATURE_RDRAND)) | ||
return; /* Nothing to do */ | ||
|
||
for (count = i = 0; i < RESEED_LOOP; i++) { | ||
ok = rdrand_long(&tmp); | ||
if (ok) | ||
count++; | ||
} | ||
|
||
if (count != RESEED_LOOP) | ||
clear_cpu_cap(c, X86_FEATURE_RDRAND); | ||
#endif | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.