qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

Merge commit 'nbd/master' into xburst

Browse Source
This commit is contained in:
Lars-Peter Clausen
2010-02-13 21:37:26 +01:00
parent b1b90fdd4d 13590610e3
commit c570e301dd
224 changed files with 7226 additions and 45129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
target/linux/generic-2.6/patches-2.6.32/028-module_exports.patch
View File

@@ -69,21 +69,25 @@
VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .; \
} \
\
@@ -323,7 +344,13 @@
@@ -323,7 +344,7 @@
\
/* Kernel symbol table: strings */ \
__ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \
- *(__ksymtab_strings) \
+ SYMTAB_KEEP_STR \
+ } \
+ \
+ /DISCARD/ : { \
+ SYMTAB_DISCARD \
+ SYMTAB_DISCARD_GPL \
+ SYMTAB_DISCARD_STR \
} \
\
/* __*init sections */ \
@@ -638,6 +659,9 @@
EXIT_TEXT \
EXIT_DATA \
EXIT_CALL \
+ SYMTAB_DISCARD \
+ SYMTAB_DISCARD_GPL \
+ SYMTAB_DISCARD_STR \
*(.discard) \
}
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -192,16 +192,24 @@ void *__symbol_get_gpl(const char *symbo

2
target/linux/generic-2.6/patches-2.6.32/221-binfmt_elf_gcc4.1.patch
View File

@@ -1,6 +1,6 @@
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1193,7 +1193,7 @@ static unsigned long vma_dump_size(struc
@@ -1170,7 +1170,7 @@
if (FILTER(ELF_HEADERS) &&
vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) {
u32 __user *header = (u32 __user *) vma->vm_start;

22
target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch
View File

@@ -7,7 +7,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--- a/include/linux/if_packet.h
+++ b/include/linux/if_packet.h
@@ -31,6 +31,8 @@ struct sockaddr_ll
@@ -31,6 +31,8 @@
/* These ones are invisible by user level */
#define PACKET_LOOPBACK 5 /* MC/BRD frame looped back */
#define PACKET_FASTROUTE 6 /* Fastrouted frame */
@@ -16,7 +16,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/* Packet socket options */
@@ -48,6 +50,7 @@ struct sockaddr_ll
@@ -48,6 +50,7 @@
#define PACKET_RESERVE 12
#define PACKET_TX_RING 13
#define PACKET_LOSS 14
@@ -26,7 +26,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
{
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -204,6 +204,7 @@ struct packet_sock {
@@ -204,6 +204,7 @@
unsigned int tp_reserve;
unsigned int tp_loss:1;
#endif
@@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
};
struct packet_skb_cb {
@@ -342,6 +343,7 @@ static int packet_rcv_spkt(struct sk_buf
@@ -342,6 +343,7 @@
{
struct sock *sk;
struct sockaddr_pkt *spkt;
@@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/*
* When we registered the protocol we saved the socket in the data
@@ -349,6 +351,7 @@ static int packet_rcv_spkt(struct sk_buf
@@ -349,6 +351,7 @@
*/
sk = pt->af_packet_priv;
@@ -50,7 +50,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/*
* Yank back the headers [hope the device set this
@@ -361,7 +364,7 @@ static int packet_rcv_spkt(struct sk_buf
@@ -361,7 +364,7 @@
* so that this procedure is noop.
*/
@@ -59,7 +59,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
goto out;
if (dev_net(dev) != sock_net(sk))
@@ -545,12 +548,12 @@ static int packet_rcv(struct sk_buff *sk
@@ -545,12 +548,12 @@
int skb_len = skb->len;
unsigned int snaplen, res;
@@ -75,7 +75,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (dev_net(dev) != sock_net(sk))
goto drop;
@@ -667,12 +670,12 @@ static int tpacket_rcv(struct sk_buff *s
@@ -667,12 +670,12 @@
struct timeval tv;
struct timespec ts;
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (dev_net(dev) != sock_net(sk))
goto drop;
@@ -1381,6 +1384,7 @@ static int packet_create(struct net *net
@@ -1390,6 +1393,7 @@
spin_lock_init(&po->bind_lock);
mutex_init(&po->pg_vec_lock);
po->prot_hook.func = packet_rcv;
@@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
@@ -1728,6 +1732,16 @@ packet_setsockopt(struct socket *sock, i
@@ -1737,6 +1741,16 @@
ret = packet_mc_drop(sk, &mreq);
return ret;
}
@@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
#ifdef CONFIG_PACKET_MMAP
case PACKET_RX_RING:
@@ -1873,6 +1887,13 @@ static int packet_getsockopt(struct sock
@@ -1882,6 +1896,13 @@
data = &val;
break;

11
target/linux/generic-2.6/patches-2.6.32/270-scci_sd_section_fix.patch
View File

@@ -1,11 +0,0 @@
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2394,7 +2394,7 @@ err_out:
*
* Note: this function unregisters this driver from the scsi mid-level.
**/
-static void __exit exit_sd(void)
+static void exit_sd(void)
{
int i;

22
target/linux/generic-2.6/patches-2.6.32/850-if_no_generic_time.patch
View File

@@ -1,22 +0,0 @@
Provide a dummy implementation of clocksource_max_deferment() for such
platforms.
Signed-off-by: Aaro Koskinen <aaro.koskinen <at> iki.fi>
---
kernel/time/clocksource.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -502,6 +502,11 @@ static void clocksource_select(void)
#else /* CONFIG_GENERIC_TIME */
+static inline u64 clocksource_max_deferment(struct clocksource *cs)
+{
+ return 0;
+}
+
static inline void clocksource_select(void) { }
#endif

26
target/linux/generic-2.6/patches-2.6.32/980-vm_exports.patch
View File

@@ -1,6 +1,6 @@
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2608,6 +2608,16 @@ int shmem_lock(struct file *file, int lo
@@ -2608,6 +2608,16 @@
/* common code */
@@ -17,7 +17,7 @@
/**
* shmem_file_setup - get an unlinked file living in tmpfs
* @name: name for dentry (to be seen in /proc/<pid>/maps
@@ -2687,9 +2697,6 @@ int shmem_zero_setup(struct vm_area_stru
@@ -2687,9 +2697,6 @@
if (IS_ERR(file))
return PTR_ERR(file);
@@ -30,7 +30,7 @@
}
--- a/fs/file.c
+++ b/fs/file.c
@@ -271,6 +271,7 @@ int expand_files(struct files_struct *fi
@@ -271,6 +271,7 @@
/* All good, so we try */
return expand_fdtable(files, nr);
}
@@ -40,7 +40,7 @@
{
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -507,6 +507,7 @@ struct files_struct *get_files_struct(st
@@ -507,6 +507,7 @@
return files;
}
@@ -48,7 +48,7 @@
void put_files_struct(struct files_struct *files)
{
@@ -526,6 +527,7 @@ void put_files_struct(struct files_struc
@@ -526,6 +527,7 @@
free_fdtable(fdt);
}
}
@@ -58,7 +58,7 @@
{
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -168,6 +168,7 @@ void __put_task_struct(struct task_struc
@@ -168,6 +168,7 @@
if (!profile_handoff_task(tsk))
free_task(tsk);
}
@@ -68,7 +68,7 @@
* macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -6093,6 +6093,7 @@ int can_nice(const struct task_struct *p
@@ -6093,6 +6093,7 @@
return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
capable(CAP_SYS_NICE));
}
@@ -78,7 +78,7 @@
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1100,6 +1100,7 @@ unsigned long zap_page_range(struct vm_a
@@ -1100,6 +1100,7 @@
tlb_finish_mmu(tlb, address, end);
return end;
}
@@ -86,7 +86,7 @@
/**
* zap_vma_ptes - remove ptes mapping the vma
@@ -2486,6 +2487,7 @@ int vmtruncate_range(struct inode *inode
@@ -2486,6 +2487,7 @@
return 0;
}
@@ -96,7 +96,7 @@
* We enter with non-exclusive mmap_sem (to exclude vma changes,
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -1111,6 +1111,7 @@ void unmap_kernel_range(unsigned long ad
@@ -1172,6 +1172,7 @@
vunmap_page_range(addr, end);
flush_tlb_kernel_range(addr, end);
}
@@ -104,7 +104,7 @@
int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
{
@@ -1226,6 +1227,7 @@ struct vm_struct *get_vm_area(unsigned l
@@ -1287,6 +1288,7 @@
return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
-1, GFP_KERNEL, __builtin_return_address(0));
}
@@ -114,7 +114,7 @@
void *caller)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -713,6 +713,7 @@ extern void show_free_areas(void);
@@ -713,6 +713,7 @@
int shmem_lock(struct file *file, int lock, struct user_struct *user);
struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
@@ -124,7 +124,7 @@
#ifndef CONFIG_MMU
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1070,6 +1070,7 @@ struct sighand_struct *lock_task_sighand
@@ -1070,6 +1070,7 @@
return sighand;
}

2
target/linux/generic-2.6/patches-2.6.32/999-use_preinit_as_init.patch
View File

@@ -1,6 +1,6 @@
--- a/init/main.c
+++ b/init/main.c
@@ -836,10 +836,7 @@ static noinline int init_post(void)
@@ -836,10 +836,7 @@
printk(KERN_WARNING "Failed to execute %s. Attempting "
"defaults...\n", execute_command);
}