Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Fix build breakage - sn_force_interrupt_flag: undefined

-42
-42
arch/ia64/sn/kernel/sn2/sn_proc_fs.c
··· 45 45 return single_open(file, licenseID_show, NULL); 46 46 } 47 47 48 - /* 49 - * Enable forced interrupt by default. 50 - * When set, the sn interrupt handler writes the force interrupt register on 51 - * the bridge chip. The hardware will then send an interrupt message if the 52 - * interrupt line is active. This mimics a level sensitive interrupt. 53 - */ 54 - extern int sn_force_interrupt_flag; 55 - 56 - static int sn_force_interrupt_show(struct seq_file *s, void *p) 57 - { 58 - seq_printf(s, "Force interrupt is %s\n", 59 - sn_force_interrupt_flag ? "enabled" : "disabled"); 60 - return 0; 61 - } 62 - 63 - static ssize_t sn_force_interrupt_write_proc(struct file *file, 64 - const char __user *buffer, size_t count, loff_t *data) 65 - { 66 - char val; 67 - 68 - if (copy_from_user(&val, buffer, 1)) 69 - return -EFAULT; 70 - 71 - sn_force_interrupt_flag = (val == '0') ? 0 : 1; 72 - return count; 73 - } 74 - 75 - static int sn_force_interrupt_open(struct inode *inode, struct file *file) 76 - { 77 - return single_open(file, sn_force_interrupt_show, NULL); 78 - } 79 - 80 48 static int coherence_id_show(struct seq_file *s, void *p) 81 49 { 82 50 seq_printf(s, "%d\n", partition_coherence_id()); ··· 82 114 .release = single_release, 83 115 }; 84 116 85 - static const struct file_operations proc_sn_force_intr_fops = { 86 - .open = sn_force_interrupt_open, 87 - .read = seq_read, 88 - .write = sn_force_interrupt_write_proc, 89 - .llseek = seq_lseek, 90 - .release = single_release, 91 - }; 92 - 93 117 static const struct file_operations proc_coherence_id_fops = { 94 118 .open = coherence_id_open, 95 119 .read = seq_read, ··· 109 149 proc_create("system_serial_number", 0444, sgi_proc_dir, 110 150 &proc_system_sn_fops); 111 151 proc_create("licenseID", 0444, sgi_proc_dir, &proc_license_id_fops); 112 - proc_create("sn_force_interrupt", 0644, sgi_proc_dir, 113 - &proc_sn_force_intr_fops); 114 152 proc_create("coherence_id", 0444, sgi_proc_dir, 115 153 &proc_coherence_id_fops); 116 154 proc_create("sn_topology", 0444, sgi_proc_dir, &proc_sn_topo_fops);