History

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

Linus Torvalds committed 15 years ago

Commit ecb78ab2 parents 85cf0ac 5e42d101 file · +0 −42Browse files

Unified · Split

arch/ia64/sn/kernel/sn2/sn_proc_fs.c+0−42
@@ -45,38 +45,6 @@ static int licenseID_open(struct inode *inode, struct file *file) · 44 unmodified lines
4545 return single_open(file, licenseID_show, NULL);
4646 }
4747
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−
8048 static int coherence_id_show(struct seq_file *s, void *p)
8149 {
8250 seq_printf(s, "%d\n", partition_coherence_id());
@@ -114,14 +82,6 @@ static const struct file_operations proc_license_id_fops = { · 31 unmodified lines
11482 .release = single_release,
11583 };
11684
117−static const struct file_operations proc_sn_force_intr_fops = {
118− .open = sn_force_interrupt_open,
119− .read = seq_read,
120− .write = sn_force_interrupt_write_proc,
121− .llseek = seq_lseek,
122− .release = single_release,
123−};
124−
12585 static const struct file_operations proc_coherence_id_fops = {
12686 .open = coherence_id_open,
12787 .read = seq_read,
@@ -149,8 +109,6 @@ void register_sn_procfs(void) · 21 unmodified lines
149109 proc_create("system_serial_number", 0444, sgi_proc_dir,
150110 &proc_system_sn_fops);
151111 proc_create("licenseID", 0444, sgi_proc_dir, &proc_license_id_fops);
152− proc_create("sn_force_interrupt", 0644, sgi_proc_dir,
153− &proc_sn_force_intr_fops);
154112 proc_create("coherence_id", 0444, sgi_proc_dir,
155113 &proc_coherence_id_fops);
156114 proc_create("sn_topology", 0444, sgi_proc_dir, &proc_sn_topo_fops);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t