litmus-rt.git - The LITMUS^RT kernel.

diff options

-rw-r--r--

1 files changed, 2 insertions, 31 deletions


diff --git a/include/asm-arm/types.h b/include/asm-arm/types.h index 3141451a9bd6..345df01534a4 100644 --- a/include/asm-arm/types.h +++ b/include/asm-arm/types.h
@@ -1,29 +1,12 @@
1	#ifndef __ASM_ARM_TYPES_H	1	#ifndef __ASM_ARM_TYPES_H
2	#define __ASM_ARM_TYPES_H	2	#define __ASM_ARM_TYPES_H
3		3
		4	#include <asm-generic/int-ll64.h>
		5
4	#ifndef __ASSEMBLY__	6	#ifndef __ASSEMBLY__
5		7
6	typedef unsigned short umode_t;	8	typedef unsigned short umode_t;
7		9
8	/*
9	* __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
10	* header files exported to user space
11	*/
12
13	typedef __signed__ char __s8;
14	typedef unsigned char __u8;
15
16	typedef __signed__ short __s16;
17	typedef unsigned short __u16;
18
19	typedef __signed__ int __s32;
20	typedef unsigned int __u32;
21
22	#if defined(__GNUC__)
23	__extension__ typedef __signed__ long long __s64;
24	__extension__ typedef unsigned long long __u64;
25	#endif
26
27	#endif /* __ASSEMBLY__ */	10	#endif /* __ASSEMBLY__ */
28		11
29	/*	12	/*
@@ -35,18 +18,6 @@ __extension__ typedef unsigned long long __u64;
35		18
36	#ifndef __ASSEMBLY__	19	#ifndef __ASSEMBLY__
37		20
38	typedef signed char s8;
39	typedef unsigned char u8;
40
41	typedef signed short s16;
42	typedef unsigned short u16;
43
44	typedef signed int s32;
45	typedef unsigned int u32;
46
47	typedef signed long long s64;
48	typedef unsigned long long u64;
49
50	/* Dma addresses are 32-bits wide. */	21	/* Dma addresses are 32-bits wide. */
51		22
52	typedef u32 dma_addr_t;	23	typedef u32 dma_addr_t;

483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552

/* * linux/mm/vmstat.c * * Manages VM statistics * Copyright (C) 1991, 1992, 1993, 1994 Linus Torvalds * * zoned VM statistics * Copyright (C) 2006 Silicon Graphics, Inc., * Christoph Lameter <christoph@lameter.com> */ #include <linux/mm.h> #include <linux/err.h> #include <linux/module.h> #include <linux/cpu.h> #include <linux/sched.h> #ifdef CONFIG_VM_EVENT_COUNTERS DEFINE_PER_CPU(struct vm_event_state, vm_event_states) = {{0}}; EXPORT_PER_CPU_SYMBOL(vm_event_states); static void sum_vm_events(unsigned long *ret, cpumask_t *cpumask) { int cpu; int i; memset(ret, 0, NR_VM_EVENT_ITEMS * sizeof(unsigned long)); for_each_cpu_mask(cpu, *cpumask) { struct vm_event_state *this = &per_cpu(vm_event_states, cpu); for (i = 0; i < NR_VM_EVENT_ITEMS; i++) ret[i] += this->event[i]; } } /* * Accumulate the vm event counters across all CPUs. * The result is unavoidably approximate - it can change * during and after execution of this function. */ void all_vm_events(unsigned long *ret) { get_online_cpus(); sum_vm_events(ret, &cpu_online_map); put_online_cpus(); } EXPORT_SYMBOL_GPL(all_vm_events); #ifdef CONFIG_HOTPLUG /* * Fold the foreign cpu events into our own. * * This is adding to the events on one processor * but keeps the global counts constant. */ void vm_events_fold_cpu(int cpu) { struct vm_event_state *fold_state = &per_cpu(vm_event_states, cpu); int i; for (i = 0; i < NR_VM_EVENT_ITEMS; i++) { count_vm_events(i, fold_state->event[i]); fold_state->event[i] = 0; } } #endif /* CONFIG_HOTPLUG */ #endif /* CONFIG_VM_EVENT_COUNTERS */ /* * Manage combined zone based / global counters * * vm_stat contains the global counters */ atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS]; EXPORT_SYMBOL(vm_stat); #ifdef CONFIG_SMP static int calculate_threshold(struct zone *zone) { int threshold; int mem; /* memory in 128 MB units */ /* * The threshold scales with the number of processors and the amount * of memory per zone. More memory means that we can defer updates for * longer, more processors could lead to more contention. * fls() is used to have a cheap way of logarithmic scaling. * * Some sample thresholds: * * Threshold Processors (fls) Zonesize fls(mem+1) * ------------------------------------------------------------------ * 8 1 1 0.9-1 GB 4 * 16 2 2 0.9-1 GB 4 * 20 2 2 1-2 GB 5 * 24 2 2 2-4 GB 6 * 28 2 2 4-8 GB 7


context:
space:
mode: