Skip to content

Commit

Permalink
Linux 3.0.101
Browse files Browse the repository at this point in the history
  • Loading branch information
boype committed Dec 22, 2013
1 parent eb8133c commit ab1d42e
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
VERSION = 3
PATCHLEVEL = 0
SUBLEVEL = 100
SUBLEVEL = 101
EXTRAVERSION =
NAME = Sneaky Weasel

Expand Down
6 changes: 3 additions & 3 deletions arch/parisc/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -811,14 +811,14 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
else {

/*
* The kernel should never fault on its own address space.
* The kernel should never fault on its own address space,
* unless pagefault_disable() was called before.
*/

if (fault_space == 0)
if (fault_space == 0 && !in_atomic())
{
pdc_chassis_send_status(PDC_CHASSIS_DIRECT_PANIC);
parisc_terminate("Kernel Fault", regs, code, fault_address);

}
}

Expand Down
3 changes: 1 addition & 2 deletions drivers/char/random.c
Original file line number Diff line number Diff line change
Expand Up @@ -1435,12 +1435,11 @@ ctl_table random_table[] = {

static u32 random_int_secret[MD5_MESSAGE_BYTES / 4] ____cacheline_aligned;

static int __init random_int_secret_init(void)
int random_int_secret_init(void)
{
get_random_bytes(random_int_secret, sizeof(random_int_secret));
return 0;
}
late_initcall(random_int_secret_init);

/*
* Get a random word for internal kernel use only. Similar to urandom but
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/radeon/evergreen.c
Original file line number Diff line number Diff line change
Expand Up @@ -1749,7 +1749,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
rdev->config.evergreen.sx_max_export_size = 256;
rdev->config.evergreen.sx_max_export_pos_size = 64;
rdev->config.evergreen.sx_max_export_smx_size = 192;
rdev->config.evergreen.max_hw_contexts = 8;
rdev->config.evergreen.max_hw_contexts = 4;
rdev->config.evergreen.sq_num_cf_insts = 2;

rdev->config.evergreen.sc_prim_fifo_size = 0x40;
Expand Down
3 changes: 2 additions & 1 deletion drivers/watchdog/ts72xx_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,8 @@ static long ts72xx_wdt_ioctl(struct file *file, unsigned int cmd,

case WDIOC_GETSTATUS:
case WDIOC_GETBOOTSTATUS:
return put_user(0, p);
error = put_user(0, p);
break;

case WDIOC_KEEPALIVE:
ts72xx_wdt_kick(wdt);
Expand Down
2 changes: 2 additions & 0 deletions fs/ext4/xattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -1271,6 +1271,8 @@ int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize,
s_min_extra_isize) {
tried_min_extra_isize++;
new_extra_isize = s_min_extra_isize;
kfree(is); is = NULL;
kfree(bs); bs = NULL;
goto retry;
}
error = -1;
Expand Down
2 changes: 1 addition & 1 deletion fs/statfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ int user_statfs(const char __user *pathname, struct kstatfs *st)

int fd_statfs(int fd, struct kstatfs *st)
{
struct file *file = fget(fd);
struct file *file = fget_raw(fd);
int error = -EBADF;
if (file) {
error = vfs_statfs(&file->f_path, st);
Expand Down
1 change: 1 addition & 0 deletions include/linux/random.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ extern void add_interrupt_randomness(int irq, int irq_flags);
extern void get_random_bytes(void *buf, int nbytes);
extern void get_random_bytes_arch(void *buf, int nbytes);
void generate_random_uuid(unsigned char uuid_out[16]);
extern int random_int_secret_init(void);

#ifndef MODULE
extern const struct file_operations random_fops, urandom_fops;
Expand Down
2 changes: 2 additions & 0 deletions init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
#include <linux/shmem_fs.h>
#include <linux/slab.h>
#include <linux/perf_event.h>
#include <linux/random.h>

#include <asm/io.h>
#include <asm/bugs.h>
Expand Down Expand Up @@ -717,6 +718,7 @@ static void __init do_basic_setup(void)
init_irq_proc();
do_ctors();
do_initcalls();
random_int_secret_init();
}

static void __init do_pre_smp_initcalls(void)
Expand Down
2 changes: 1 addition & 1 deletion net/ipv6/inet6_connection_sock.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ struct dst_entry *inet6_csk_route_req(struct sock *sk,
* request_sock (formerly open request) hash tables.
*/
static u32 inet6_synq_hash(const struct in6_addr *raddr, const __be16 rport,
const u32 rnd, const u16 synq_hsize)
const u32 rnd, const u32 synq_hsize)
{
u32 c;

Expand Down

0 comments on commit ab1d42e

Please sign in to comment.