Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Fix wrong checksum calculation on 64-bit MIPS
[MIPS] VPE loader: Initialize lists before they're actually being used ...
[MIPS] Fix reported amount of freed memory - it's in kB not bytes
[MIPS] vr41xx: need one more nop with mtc0_tlbw_hazard()
[MIPS] SMTC: Fix module build by exporting symbol
[MIPS] SMTC: Fix TLB sizing bug for TLB of 64 >= entries
[MIPS] Fix APM build
[MIPS] There is no __GNUC_MAJOR__
+22
-11
+1
-1
arch/mips/Makefile
+1
-1
arch/mips/Makefile
···
623
623
624
624
ifdef CONFIG_MIPS
625
625
CHECKFLAGS += $(shell $(CC) $(CFLAGS) -dM -E -xc /dev/null | \
626
-
egrep -vw '__GNUC_(MAJOR|MINOR|PATCHLEVEL)__' | \
626
+
egrep -vw '__GNUC_(|MINOR_|PATCHLEVEL_)_' | \
627
627
sed -e 's/^\#define /-D/' -e "s/ /='/" -e "s/$$/'/")
628
628
ifdef CONFIG_64BIT
629
629
CHECKFLAGS += -m64
+1
-1
arch/mips/dec/prom/memory.c
+1
-1
arch/mips/dec/prom/memory.c
+8
-2
arch/mips/kernel/smtc.c
+8
-2
arch/mips/kernel/smtc.c
···
4
4
#include <linux/sched.h>
5
5
#include <linux/cpumask.h>
6
6
#include <linux/interrupt.h>
7
+
#include <linux/module.h>
7
8
8
9
#include <asm/cpu.h>
9
10
#include <asm/processor.h>
···
271
270
* of their initialization in smtc_cpu_setup().
272
271
*/
273
272
274
-
tlbsiz = tlbsiz & 0x3f; /* MIPS32 limits TLB indices to 64 */
275
-
cpu_data[0].tlbsize = tlbsiz;
273
+
/* MIPS32 limits TLB indices to 64 */
274
+
if (tlbsiz > 64)
275
+
tlbsiz = 64;
276
+
cpu_data[0].tlbsize = current_cpu_data.tlbsize = tlbsiz;
276
277
smtc_status |= SMTC_TLB_SHARED;
278
+
local_flush_tlb_all();
277
279
278
280
printk("TLB of %d entry pairs shared by %d VPEs\n",
279
281
tlbsiz, vpes);
···
1047
1043
}
1048
1044
}
1049
1045
}
1046
+
1047
+
EXPORT_SYMBOL(smtc_ipi_replay);
1050
1048
1051
1049
void smtc_idle_loop_hook(void)
1052
1050
{
+5
-4
arch/mips/kernel/vpe.c
+5
-4
arch/mips/kernel/vpe.c
···
139
139
struct list_head list;
140
140
};
141
141
142
-
struct vpecontrol_ {
142
+
struct {
143
143
/* Virtual processing elements */
144
144
struct list_head vpe_list;
145
145
146
146
/* Thread contexts */
147
147
struct list_head tc_list;
148
-
} vpecontrol;
148
+
} vpecontrol = {
149
+
.vpe_list = LIST_HEAD_INIT(vpecontrol.vpe_list),
150
+
.tc_list = LIST_HEAD_INIT(vpecontrol.tc_list)
151
+
};
149
152
150
153
static void release_progmem(void *ptr);
151
154
/* static __attribute_used__ void dump_vpe(struct vpe * v); */
···
1391
1388
1392
1389
/* dump_mtregs(); */
1393
1390
1394
-
INIT_LIST_HEAD(&vpecontrol.vpe_list);
1395
-
INIT_LIST_HEAD(&vpecontrol.tc_list);
1396
1391
1397
1392
val = read_c0_mvpconf0();
1398
1393
for (i = 0; i < ((val & MVPCONF0_PTC) + 1); i++) {
+2
-1
arch/mips/mm/init.c
+2
-1
arch/mips/mm/init.c
···
501
501
502
502
freed = prom_free_prom_memory();
503
503
if (freed)
504
-
printk(KERN_INFO "Freeing firmware memory: %ldk freed\n",freed);
504
+
printk(KERN_INFO "Freeing firmware memory: %ldkb freed\n",
505
+
freed >> 10);
505
506
506
507
free_init_pages("unused kernel memory",
507
508
__pa_symbol(&__init_begin),
+2
-1
include/asm-mips/checksum.h
+2
-1
include/asm-mips/checksum.h
+1
-1
include/asm-mips/hazards.h
+1
-1
include/asm-mips/hazards.h
+2
include/asm-mips/thread_info.h
+2
include/asm-mips/thread_info.h
···
118
118
#define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
119
119
#define TIF_POLLING_NRFLAG 17 /* true if poll_idle() is polling TIF_NEED_RESCHED */
120
120
#define TIF_MEMDIE 18
121
+
#define TIF_FREEZE 19
121
122
#define TIF_SYSCALL_TRACE 31 /* syscall trace active */
122
123
123
124
#define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
···
130
129
#define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK)
131
130
#define _TIF_USEDFPU (1<<TIF_USEDFPU)
132
131
#define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
132
+
#define _TIF_FREEZE (1<<TIF_FREEZE)
133
133
134
134
/* work to do on interrupt/exception return */
135
135
#define _TIF_WORK_MASK (0x0000ffef & ~_TIF_SECCOMP)