mirror of
https://github.com/torvalds/linux.git
synced 2024-11-17 17:41:44 +00:00
cee4cca740
* git://git.infradead.org/hdrcleanup-2.6: (63 commits) [S390] __FD_foo definitions. Switch to __s32 types in joystick.h instead of C99 types for consistency. Add <sys/types.h> to headers included for userspace in <linux/input.h> Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h Remove struct fddi_statistics from user view in <linux/if_fddi.h> Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390 Revert include/media changes: Mauro says those ioctls are only used in-kernel(!) Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h> Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> too Remove private struct dx_hash_info from public view in <linux/ext3_fs.h> Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h> Use __uXX types in <linux/divert.h> for struct divert_blk et al. Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible. Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely Use __uXX types in user-visible structures in <linux/nbd.h> Don't use 'u32' in user-visible struct ip_conntrack_old_tuple. Use __uXX types for S390 DASD volume label definitions which are user-visible S390 BIODASDREADCMB ioctl should use __u64 not u64 type. Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h> Fix private integer types used in V4L2 ioctls. ... Manually resolve conflict in include/linux/mtd/physmap.h
61 lines
1.3 KiB
C
61 lines
1.3 KiB
C
#ifndef __ASM_SMP_H
|
|
#define __ASM_SMP_H
|
|
|
|
#include <linux/threads.h>
|
|
#include <linux/cpumask.h>
|
|
#include <linux/bitops.h>
|
|
#include <asm/pal.h>
|
|
|
|
/* HACK: Cabrio WHAMI return value is bogus if more than 8 bits used.. :-( */
|
|
|
|
static __inline__ unsigned char
|
|
__hard_smp_processor_id(void)
|
|
{
|
|
register unsigned char __r0 __asm__("$0");
|
|
__asm__ __volatile__(
|
|
"call_pal %1 #whami"
|
|
: "=r"(__r0)
|
|
:"i" (PAL_whami)
|
|
: "$1", "$22", "$23", "$24", "$25");
|
|
return __r0;
|
|
}
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
#include <asm/irq.h>
|
|
|
|
struct cpuinfo_alpha {
|
|
unsigned long loops_per_jiffy;
|
|
unsigned long last_asn;
|
|
int need_new_asn;
|
|
int asn_lock;
|
|
unsigned long ipi_count;
|
|
unsigned long prof_multiplier;
|
|
unsigned long prof_counter;
|
|
unsigned char mcheck_expected;
|
|
unsigned char mcheck_taken;
|
|
unsigned char mcheck_extra;
|
|
} __attribute__((aligned(64)));
|
|
|
|
extern struct cpuinfo_alpha cpu_data[NR_CPUS];
|
|
|
|
#define PROC_CHANGE_PENALTY 20
|
|
|
|
#define hard_smp_processor_id() __hard_smp_processor_id()
|
|
#define raw_smp_processor_id() (current_thread_info()->cpu)
|
|
|
|
extern int smp_num_cpus;
|
|
#define cpu_possible_map cpu_present_map
|
|
|
|
int smp_call_function_on_cpu(void (*func) (void *info), void *info,int retry, int wait, cpumask_t cpu);
|
|
|
|
#else /* CONFIG_SMP */
|
|
|
|
#define smp_call_function_on_cpu(func,info,retry,wait,cpu) ({ 0; })
|
|
|
|
#endif /* CONFIG_SMP */
|
|
|
|
#define NO_PROC_ID (-1)
|
|
|
|
#endif
|